From d18ab5a0243ac431d001b59f440ed0d5b6fe4d91 Mon Sep 17 00:00:00 2001
From: unknown <kent@mysql.com>
Date: Tue, 21 Jun 2005 20:25:50 +0200
Subject: [PATCH 1/2] mysql-test-run.pl:   Added optional paths for finding
 mysqld on Windows   Added language/charset options to embedded
 mysql_client_test

mysql-test/mysql-test-run.pl:
  Added optional paths for finding mysqld on Windows
  Added language/charset options to embedded mysql_client_test
---
 mysql-test/mysql-test-run.pl | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 0ecc7bc6c52..4f673fe567d 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -772,7 +772,8 @@ sub executable_setup () {
   {
     if ( $glob_win32 )
     {
-      $path_client_bindir= mtr_path_exists("$glob_basedir/client_release");
+      $path_client_bindir= mtr_path_exists("$glob_basedir/client_release",
+                                           "$glob_basedir/bin");
       $exe_mysqld=         mtr_exe_exists ("$path_client_bindir/mysqld-nt");
       $path_language=      mtr_path_exists("$glob_basedir/share/english/");
       $path_charsetsdir=   mtr_path_exists("$glob_basedir/share/charsets");
@@ -794,7 +795,7 @@ sub executable_setup () {
     }
     else
     {
-      $exe_mysqltest=  mtr_exe_exists("$glob_basedir/client/mysqltest");
+      $exe_mysqltest=  mtr_exe_exists("$path_client_bindir/mysqltest");
       $exe_mysql_client_test=
         mtr_exe_exists("$glob_basedir/tests/mysql_client_test");
     }
@@ -2013,6 +2014,14 @@ sub run_mysqltest ($$) {
     "--port=$master->[0]->{'path_myport'} " .
     "--socket=$master->[0]->{'path_mysock'}";
 
+  if ( $glob_use_embedded_server )
+  {
+    $cmdline_mysql_client_test.=
+      " -A --language=$path_language" .
+      " -A --datadir=$slave->[0]->{'path_myddir'}" .
+      " -A --character-sets-dir=$path_charsetsdir";
+  }
+
   my $cmdline_mysql_fix_system_tables=
     "$exe_mysql_fix_system_tables --no-defaults --host=localhost --user=root --password= " .
     "--basedir=$glob_basedir --bindir=$path_client_bindir --verbose " .
@@ -2129,8 +2138,7 @@ sub run_mysqltest ($$) {
 #
 ##############################################################################
 
-sub usage ($)
-{
+sub usage ($) {
   print STDERR <<HERE;
 
 mysql-test-run [ OPTIONS ] [ TESTCASE ]

From d785fc60ab902842bf68bfb827120b8015700a98 Mon Sep 17 00:00:00 2001
From: unknown <elliot@mysql.com>
Date: Tue, 21 Jun 2005 15:40:58 -0400
Subject: [PATCH 2/2] BUG#10442 Minor changes from code review

mysql-test/r/rpl_multi_update3.result:
  Changes from code review
mysql-test/t/rpl_multi_update3.test:
  Changes from code review
sql/sql_parse.cc:
  Changes from code review
---
 mysql-test/r/rpl_multi_update3.result | 1 +
 mysql-test/t/rpl_multi_update3.test   | 1 +
 sql/sql_parse.cc                      | 8 +++++---
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/mysql-test/r/rpl_multi_update3.result b/mysql-test/r/rpl_multi_update3.result
index 4126ef0b5cb..708b230b19f 100644
--- a/mysql-test/r/rpl_multi_update3.result
+++ b/mysql-test/r/rpl_multi_update3.result
@@ -40,3 +40,4 @@ SELECT * FROM t2 ORDER BY a;
 a	b
 1	6
 2	6
+drop table t1,t2;
diff --git a/mysql-test/t/rpl_multi_update3.test b/mysql-test/t/rpl_multi_update3.test
index ec6a0c09ae5..b8c8ed79532 100644
--- a/mysql-test/t/rpl_multi_update3.test
+++ b/mysql-test/t/rpl_multi_update3.test
@@ -31,3 +31,4 @@ sync_with_master;
 SELECT * FROM t1 ORDER BY a;
 SELECT * FROM t2 ORDER BY a;
 
+drop table t1,t2;
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 81fcc30dd08..4d339fc6a0e 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1943,9 +1943,11 @@ mysql_execute_command(THD *thd)
   if (tables || &lex->select_lex != lex->all_selects_list)
     mysql_reset_errors(thd);
 
-  /* When subselects or time_zone info is used in a query
-   * we create a new TABLE_LIST containing all referenced tables
-   * and set local variable 'tables' to point to this list. */
+  /* 
+     When subselects or time_zone info is used in a query
+     we create a new TABLE_LIST containing all referenced tables
+     and set local variable 'tables' to point to this list.
+  */
   if ((&lex->select_lex != lex->all_selects_list ||
        lex->time_zone_tables_used) &&
       lex->unit.create_total_list(thd, lex, &tables))