After merge fixes: remove const and add query buffer.

tests/mysql_client_test.c

@@ -15403,7 +15403,8 @@ static void test_bug21635()
     "COUNT(i)", "COUNT(i)",
     "COUNT(i) AS A3", "A3",
   };
-  const char *query_end;
+  char query[MAX_TEST_QUERY_LENGTH];
+  char *query_end;
   MYSQL_RES *result;
   MYSQL_FIELD *field;
   unsigned int field_count, i;