bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:4306 to 4307)

[magnus.blaudd]

 4307 magnus.blaudd@stripped	2011-10-17 [merge]
      Merge 7.0 -> 7.1

    modified:
      tests/mysql_client_test.c
 4306 magnus.blaudd@stripped	2011-10-17 [merge]
      Merge 7.0 -> 7.1

    modified:
      sql/sql_parse.cc
      tests/mysql_client_test.c
=== modified file 'tests/mysql_client_test.c'
--- a/tests/mysql_client_test.c	2011-10-17 09:17:54 +0000
+++ b/tests/mysql_client_test.c	2011-10-17 11:35:32 +0000
@@ -18411,14 +18411,14 @@ static void test_bug13001491()
 
   myheader("test_bug13001491");
 
-  snprintf(query, MAX_TEST_QUERY_LENGTH,
+  my_snprintf(query, MAX_TEST_QUERY_LENGTH,
            "GRANT ALL PRIVILEGES ON *.* TO mysqltest_u1@%s",
            opt_host ? opt_host : "'localhost'");
            
   rc= mysql_query(mysql, query);
   myquery(rc);
 
-  snprintf(query, MAX_TEST_QUERY_LENGTH,
+  my_snprintf(query, MAX_TEST_QUERY_LENGTH,
            "GRANT RELOAD ON *.* TO mysqltest_u1@%s",
            opt_host ? opt_host : "'localhost'");
            
@@ -18471,7 +18471,7 @@ static void test_bug13001491()
   mysql_close(c);
   c= NULL;
 
-  snprintf(query, MAX_TEST_QUERY_LENGTH,
+  my_snprintf(query, MAX_TEST_QUERY_LENGTH,
            "DROP USER mysqltest_u1@%s",
            opt_host ? opt_host : "'localhost'");
            

No bundle (reason: useless for push emails).