From: magnus.blaudd
Date: October 17 2011 11:56am
Subject: bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:4600 to 4601)
 Bug#13001491
List-Archive: http://lists.mysql.com/commits/141471
X-Bug: 13001491
Message-Id: <201110171156.p9HBuACi022470@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4601 magnus.blaudd@stripped	2011-10-17
      Fix compilation error on Windows in MCP patch for bug#13001491
       - s/snprintf/my_snprintf/

    modified:
      tests/mysql_client_test.c
 4600 magnus.blaudd@stripped	2011-10-17 [merge]
      Merge

    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).