bk commit into 5.1 tree (msvensson:1.2443)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-02-20 12:48:56+01:00, msvensson@stripped +2 -0
  Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166
  into  pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
  MERGE: 1.1810.2372.103

  mysql-test/mysql-test-run.pl@stripped, 2007-02-20 12:48:54+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.30.49.56

  sql/sql_parse.cc@stripped, 2007-02-20 12:48:54+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.426.137.4

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/bug20166/my51-bug20166/RESYNC

--- 1.626/sql/sql_parse.cc	2007-02-06 15:52:27 +01:00
+++ 1.627/sql/sql_parse.cc	2007-02-20 12:48:54 +01:00
@@ -1359,6 +1359,7 @@
     thd->query= thd->memdup_w_gap(buff, length+1, 
 				  thd->db_length+1+QUERY_CACHE_FLAGS_SIZE);
     thd->query[length] = '\0';
+    DBUG_PRINT("query",("%-.4096s",thd->query));
     /*
       We don't need to obtain LOCK_thread_count here because in bootstrap
       mode we have only one thread.
@@ -1366,16 +1367,26 @@
     thd->query_id=next_query_id();
     mysql_parse(thd,thd->query,length);
     close_thread_tables(thd);			// Free tables
+
     if (thd->is_fatal_error)
       break;
+
+    if (thd->net.report_error)
+    {
+      /* The query failed, send error to log and abort bootstrap */
+      net_send_error(thd);
+      thd->fatal_error();
+      break;
+    }
+
     free_root(thd->mem_root,MYF(MY_KEEP_PREALLOC));
 #ifdef USING_TRANSACTIONS
     free_root(&thd->transaction.mem_root,MYF(MY_KEEP_PREALLOC));
 #endif
   }
 
-  /* thd->fatal_error should be set in case something went wrong */
 end:
+  /* Remember the exit code of bootstrap */
   bootstrap_error= thd->is_fatal_error;
 
   net_end(&thd->net);

--- 1.273/mysql-test/mysql-test-run.pl	2007-02-19 12:59:18 +01:00
+++ 1.274/mysql-test/mysql-test-run.pl	2007-02-20 12:48:54 +01:00
@@ -2905,8 +2905,6 @@
 
   mtr_add_arg($args, "--no-defaults");
   mtr_add_arg($args, "--bootstrap");
-  mtr_add_arg($args, "--console");
-  mtr_add_arg($args, "--skip-grant-tables");
   mtr_add_arg($args, "--basedir=%s", $path_my_basedir);
   mtr_add_arg($args, "--datadir=%s", $data_dir);
   mtr_add_arg($args, "--skip-innodb");
@@ -2932,6 +2930,11 @@
   # MYSQLD_BOOTSTRAP to the full path to a mysqld which does accept
   # --bootstrap, to accommodate this.
   my $exe_mysqld_bootstrap = $ENV{'MYSQLD_BOOTSTRAP'} || $exe_mysqld;
+
+  # ----------------------------------------------------------------------
+  # export MYSQLD_BOOTSTRAP_CMD variable containing <path>/mysqld <args>
+  # ----------------------------------------------------------------------
+  $ENV{'MYSQLD_BOOTSTRAP_CMD'}= "$exe_mysqld_bootstrap " . join(" ", @$args);
 
   # Log bootstrap command
   my $path_bootstrap_log= "$opt_vardir/log/bootstrap.log";