bzr commit into mysql-6.0-rpl branch (luis.soares:2794)

[Luis Soares]

#At file:///home/lsoares/Workspace/mysql-server/MC/merge/6.0-rpl/

 2794 Luis Soares	2009-01-26 [merge]
      merge: 5.1-rpl -> 6.0-rpl
modified:
  client/mysqltest.cc
  mysql-test/include/wait_until_connected_again.inc
  mysql-test/lib/mtr_report.pm
  mysql-test/mysql-test-run.pl
  mysql-test/t/events_bugs.test
  mysql-test/t/myisam_data_pointer_size_func.test
  mysql-test/t/mysqlcheck.test

=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2009-01-26 16:03:39 +0000
+++ b/client/mysqltest.cc	2009-01-26 16:32:29 +0000
@@ -1438,6 +1438,7 @@ static int run_tool(const char *tool_pat
   DBUG_RETURN(ret);
 }
 
+
 /*
   Test if diff is present.  This is needed on Windows systems
   as the OS returns 1 whether diff is successful or if it is
@@ -1451,21 +1452,21 @@ static int run_tool(const char *tool_pat
 
 int diff_check()
 {
- char buf[512]= {0};
- FILE *res_file;
- const char *cmd = "diff -v";
- int have_diff = 0;
-
-  if (!(res_file= popen(cmd, "r")))
-    die("popen(\"%s\", \"r\") failed", cmd);
-
-/* if diff is not present, nothing will be in stdout to increment have_diff */
-  if (fgets(buf, sizeof(buf), res_file))
-  {
-    have_diff += 1;
-  } 
- pclose(res_file);
- return have_diff;
+    char buf[512]= {0};
+    FILE *res_file;
+    const char *cmd = "diff -v";
+    int have_diff = 0;
+
+    if (!(res_file= popen(cmd, "r")))
+        die("popen(\"%s\", \"r\") failed", cmd);
+
+    /* if diff is not present, nothing will be in stdout to increment have_diff */
+    if (fgets(buf, sizeof(buf), res_file))
+        {
+            have_diff += 1;
+        } 
+    pclose(res_file);
+    return have_diff;
 }
 
 /*
@@ -1489,7 +1490,7 @@ void show_diff(DYNAMIC_STRING* ds,
 
   if (init_dynamic_string(&ds_tmp, "", 256, 256))
     die("Out of memory");
-  
+
   /* determine if we have diff on Windows
      needs special processing due to return values
      on that OS
@@ -1536,9 +1537,9 @@ void show_diff(DYNAMIC_STRING* ds,
 	    }
       }
     }
-  }
+  }  
 
-  if (!(have_diff))
+  if (! have_diff)
   {
     /*
       Fallback to dump both files to result file and inform

=== modified file 'mysql-test/include/wait_until_connected_again.inc'
--- a/mysql-test/include/wait_until_connected_again.inc	2009-01-26 16:03:39 +0000
+++ b/mysql-test/include/wait_until_connected_again.inc	2009-01-26 16:32:29 +0000
@@ -12,8 +12,8 @@ let $mysql_errno= 9999;
 while ($mysql_errno)
 {
   # Strangely enough, the server might return "Too many connections"
-  # while being shutdown, thus 1040 is an "allowed" error.
-  # See BUG#36228.
+  # while being shutdown, thus 1040 is an "allowed" error
+  # See BUG#36228
   --error 0,1040,1053,2002,2003,2006,2013
   show status;
 

=== modified file 'mysql-test/lib/mtr_report.pm'
--- a/mysql-test/lib/mtr_report.pm	2009-01-26 16:03:39 +0000
+++ b/mysql-test/lib/mtr_report.pm	2009-01-26 16:32:29 +0000
@@ -261,7 +261,7 @@ sub mtr_report_stats ($) {
   {
     mtr_warning("Got errors/warnings while running tests, please examine",
 		"'$warnlog' for details.");
-  }
+ }
 
   print "\n";
 

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-01-26 16:03:39 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-01-26 16:32:29 +0000
@@ -122,7 +122,6 @@ our $opt_suites;
 our $opt_suites_default= "main,backup,backup_engines,binlog,rpl,rpl_ndb,ndb"; # Default suites to run
 our $opt_script_debug= 0;  # Script debugging, enable with --script-debug
 our $opt_verbose= 0;  # Verbose output, enable with --verbose
-
 our $exe_mysql;
 our $exe_mysqladmin;
 our $exe_mysqltest;
@@ -1862,7 +1861,6 @@ sub environment_setup {
 		   "$basedir/extra/my_print_defaults");
   $ENV{'MYSQL_MY_PRINT_DEFAULTS'}= native_path($exe_my_print_defaults);
 
-
   # ----------------------------------------------------
   # myisam tools
   # ----------------------------------------------------

=== modified file 'mysql-test/t/events_bugs.test'
--- a/mysql-test/t/events_bugs.test	2009-01-26 16:03:39 +0000
+++ b/mysql-test/t/events_bugs.test	2009-01-26 16:32:29 +0000
@@ -1226,6 +1226,6 @@ DROP DATABASE events_test;
 # (option with no argument in events_bugs-master.opt  turns the scheduler on).
 SET GLOBAL event_scheduler = 'ON';
 --source include/running_event_scheduler.inc
-SET @@global.concurrent_insert = @concurrent_insert;
+SET @@global.concurrent_insert= @concurrent_insert;
 
 # THIS MUST BE THE LAST LINE in this file.

=== modified file 'mysql-test/t/myisam_data_pointer_size_func.test'
--- a/mysql-test/t/myisam_data_pointer_size_func.test	2009-01-26 16:03:39 +0000
+++ b/mysql-test/t/myisam_data_pointer_size_func.test	2009-01-26 16:32:29 +0000
@@ -103,7 +103,6 @@ DROP TABLE t1;
 
 connection default;
 SET @@global.myisam_data_pointer_size= @start_value;
-
 ################################################################
 # End of functionality Testing for myisam_data_pointer_size    #
 ################################################################

=== modified file 'mysql-test/t/mysqlcheck.test'
--- a/mysql-test/t/mysqlcheck.test	2009-01-26 16:03:39 +0000
+++ b/mysql-test/t/mysqlcheck.test	2009-01-26 16:32:29 +0000
@@ -192,4 +192,5 @@ DROP DATABASE `a@b`;
 
 USE test;
 
+
 --echo End of 5.1 tests