Merge branch 'mysql-5.7' into mysql-trunk

Author: Anushree Prakash B

sql-common/client.cc

@@ -737,6 +737,7 @@ void read_ok_ex(MYSQL *mysql, ulong length)
 {
   size_t total_len, len;
   uchar *pos, *saved_pos;
+  my_ulonglong affected_rows, insert_id;
   char *db;
 
   struct charset_info_st *saved_cs;
@@ -750,14 +751,30 @@ void read_ok_ex(MYSQL *mysql, ulong length)
 
   pos= mysql->net.read_pos + 1;
 
-  /* affected rows */
-  mysql->affected_rows= net_field_length_ll(&pos);
-  /* insert id */
-  mysql->insert_id= net_field_length_ll(&pos);
+  affected_rows = net_field_length_ll(&pos); /* affected rows */
+  insert_id = net_field_length_ll(&pos); /* insert id */
 
-  DBUG_PRINT("info",("affected_rows: %lu  insert_id: %lu",
-                     (ulong) mysql->affected_rows,
-                     (ulong) mysql->insert_id));
+  /*
+   The following check ensures that we skip the assignment for the
+   above read fields (i.e. affected_rows and insert_id) wherein the
+   EOF packets are deprecated and the server sends OK packet instead
+   with a packet header of 0xFE (254) to identify it as an EOF packet.
+   We ignore this assignment as the valid contents of EOF packet include
+   packet marker, server status and warning count only. However, we would
+   assign these values to the connection handle if it was an OK packet
+   with a packet header of 0x00.
+  */
+
+  if (!((mysql->server_capabilities & CLIENT_DEPRECATE_EOF) &&
+         mysql->net.read_pos[0] == 254))
+  {
+    mysql->affected_rows= affected_rows;
+    mysql->insert_id= insert_id;
+
+    DBUG_PRINT("info",("affected_rows: %lu  insert_id: %lu",
+                       (ulong) mysql->affected_rows,
+                       (ulong) mysql->insert_id));
+  }
 
   /* server status */
   mysql->server_status= uint2korr(pos);

testclients/mysql_client_test.c

@@ -15526,6 +15526,75 @@ static void test_mysql_insert_id()
   myquery(rc);
 }
 
+/*
+  Test for bug#22028117: MYSQLCLIENT DOES NOT RETURN CORRECT
+  MYSQL_INSERT_ID VIA DATABASE HANDLE
+*/
+
+static void test_bug22028117()
+{
+  my_ulonglong res;
+  int rc;
+  MYSQL_STMT *stmt;
+
+  myheader("test_bug22028117");
+
+  rc = mysql_query(mysql, "USE test");
+  myquery(rc);
+  rc= mysql_query(mysql, "DROP TABLE IF EXISTS t1");
+  myquery(rc);
+  rc= mysql_query(mysql, "CREATE TABLE t1 ("
+                         "f1 INT NOT NULL PRIMARY KEY AUTO_INCREMENT,"
+                         "f2 VARCHAR(255))");
+  myquery(rc);
+  res= mysql_insert_id(mysql);
+  DIE_UNLESS(res == 0);
+
+  rc= mysql_query(mysql, "INSERT INTO t1 (f2) VALUES ('a')");
+  myquery(rc);
+  res= mysql_insert_id(mysql);
+  DIE_UNLESS(res == 1);
+
+  rc= mysql_query(mysql, "INSERT INTO t1 (f2) VALUES ('b')");
+  myquery(rc);
+  res= mysql_insert_id(mysql);
+  DIE_UNLESS(res == 2);
+
+  /* Make sure that the value of insert_id is not lost after SELECT */
+  stmt= mysql_simple_prepare(mysql, "SELECT MAX(f1) FROM t1");
+  check_stmt(stmt);
+  rc= mysql_stmt_execute(stmt);
+  check_execute(stmt, rc);
+  rc= my_process_stmt_result(stmt);
+  DIE_UNLESS(rc == 1);
+  mysql_stmt_close(stmt);
+
+  res= mysql_insert_id(mysql);
+  DIE_UNLESS(res == 2);
+  /* insert_id will be reset to 0 after a new table is created */
+  rc= mysql_query(mysql, "DROP TABLE IF EXISTS t2");
+  myquery(rc);
+
+  rc= mysql_query(mysql, "CREATE TABLE t2 ("
+                         "f1 INT NOT NULL PRIMARY KEY AUTO_INCREMENT,"
+                         "f2 VARCHAR(255))");
+  myquery(rc);
+  res= mysql_insert_id(mysql);
+  DIE_UNLESS(res == 0);
+
+  /*
+    mysql_insert_id() should return expr when the INSERT query contains
+    last_insert_id(expr)
+  */
+  rc= mysql_query(mysql, "INSERT INTO t1 (f1) VALUES (last_insert_id(100))");
+  myquery(rc);
+  res= mysql_insert_id(mysql);
+  DIE_UNLESS(res == 100);
+
+  rc= mysql_query(mysql, "DROP TABLE t1,t2");
+  myquery(rc);
+}
+
 /*
   Bug#20152: mysql_stmt_execute() writes to MYSQL_TYPE_DATE buffer
 */
@@ -21177,6 +21246,7 @@ static struct my_tests_st my_tests[]= {
   { "test_bug22559575", test_bug22559575 },
   { "test_bug24963580", test_bug24963580 },
   { "test_mysql_binlog", test_mysql_binlog },
+  { "test_bug22028117", test_bug22028117 },
   { 0, 0 }
 };