From b05471de734b2695dd545608116716d39eadd91d Mon Sep 17 00:00:00 2001
From: "istruewing@stella.local" <>
Date: Mon, 12 Nov 2007 13:07:54 +0100
Subject: [PATCH 1/2] Bug#31210 - INSERT DELAYED crashes server when used on   
              partitioned table

Post-pushbuild fix

Pushbuild detected yet another need for lex initialization in
embedded server.
---
 libmysqld/lib_sql.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index d929024483c..2481956023c 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -587,6 +587,7 @@ void *create_embedded_thd(int client_flag)
     fprintf(stderr,"store_globals failed.\n");
     goto err;
   }
+  lex_start(thd);
 
   /* TODO - add init_connect command execution */
 

From edce8a63e222c2ee65b9f3a64641ca0044957fc3 Mon Sep 17 00:00:00 2001
From: "istruewing@stella.local" <>
Date: Tue, 13 Nov 2007 10:25:22 +0100
Subject: [PATCH 2/2] Bug#32078 - Excessive warnings: One can only use the
 --user switch             if running as root

Every start of a server in the test suite raised that warning.

The cause was an unconditionla add of the --user option to the
server command line. Only the "root" user (effective user id == 0)
must use that option.

Added check for effective user id == 0 before adding --user.

Thanks to Magnus Svensson for the patch.
---
 mysql-test/mysql-test-run.pl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index c3312dce3ac..f6ea5550007 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3754,7 +3754,9 @@ sub mysqld_arguments ($$$$) {
   # When mysqld is run by a root user(euid is 0), it will fail
   # to start unless we specify what user to run as. If not running
   # as root it will be ignored, see BUG#30630
-  if (!(grep(/^--user/, @$extra_opt, @opt_extra_mysqld_opt))) {
+  my $euid= $>;
+  if (!$glob_win32 and $euid == 0 and
+      grep(/^--user/, @$extra_opt, @opt_extra_mysqld_opt) == 0) {
     mtr_add_arg($args, "%s--user=root");
   }