5.0-bugteam->5.1-bugteam merge

tests/mysql_client_test.c

@@ -17578,7 +17578,7 @@ static void test_bug38486(void)
 
 static void test_bug40365(void)
 {
-  uint         rc, i, count= 1;
+  uint         rc, i;
   MYSQL_STMT   *stmt= 0;
   MYSQL_BIND   my_bind[2];
   my_bool      is_null[2]= {0};