List:Commits« Previous MessageNext Message »
From:Chuck Bell Date:August 1 2011 3:30pm
Subject:bzr push into mysql-5.5 branch (chuck.bell:3484)
View as plain text  
 3484 Chuck Bell	2011-08-01 [merge]
      Merge with latest PB test changes.

    modified:
      mysql-test/r/mysql_plugin.result
      mysql-test/t/mysql_plugin.test
=== modified file 'client/mysql_plugin.c'
--- a/client/mysql_plugin.c	2011-07-29 15:47:24 +0000
+++ b/client/mysql_plugin.c	2011-08-01 15:19:56 +0000
@@ -323,6 +323,7 @@ static int get_default_values()
   int ret= 0;
   FILE *file= 0;
 
+  bzero(tool_path, FN_REFLEN);
   if ((error= find_tool("my_print_defaults" FN_EXEEXT, tool_path)))
     goto exit;
   else
@@ -341,6 +342,10 @@ static int get_default_values()
   
       snprintf(defaults_cmd, sizeof(defaults_cmd), format_str,
                add_quotes(tool_path), add_quotes(defaults_file));
+      if (opt_verbose)
+      {
+        printf("# my_print_defaults found: %s\n", tool_path);
+      }
     }
 #else
     snprintf(defaults_cmd, sizeof(defaults_cmd),

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5 branch (chuck.bell:3484) Chuck Bell3 Aug