bk commit into 5.0 tree (holyfoot:1.1952) BUG#9632

[holyfoot]

Below is the list of changes that have just been committed into a local
5.0 repository of hf. When hf 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
  1.1952 05/05/09 16:26:06 holyfoot@hf-ibm.(none) +2 -0
  Fix for bug #9632 (strict.test fails in -embedded-server mode)

  sql/sql_parse.cc
    1.449 05/05/09 16:25:29 holyfoot@stripped +3 -3
    dispatch_command is the more appropriate place for this code

  libmysqld/libmysqld.c
    1.65 05/05/09 16:25:28 holyfoot@stripped +8 -5
    we need this code before we create thd instance

# 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:	holyfoot
# Host:	hf-ibm.(none)
# Root:	/home/hf/work/mysql-5.0.emb

--- 1.448/sql/sql_parse.cc	Fri May  6 15:46:05 2005
+++ 1.449/sql/sql_parse.cc	Mon May  9 16:25:29 2005
@@ -1433,9 +1433,6 @@
   }
   else
   {
-    if (thd->killed == THD::KILL_QUERY || thd->killed == THD::KILL_BAD_DATA)
-      thd->killed= THD::NOT_KILLED;
-
     packet=(char*) net->read_pos;
     command = (enum enum_server_command) (uchar) packet[0];
     if (command >= COM_END)
@@ -1481,6 +1478,9 @@
   NET *net= &thd->net;
   bool error= 0;
   DBUG_ENTER("dispatch_command");
+
+  if (thd->killed == THD::KILL_QUERY || thd->killed == THD::KILL_BAD_DATA)
+    thd->killed= THD::NOT_KILLED;
 
   thd->command=command;
   /*

--- 1.64/libmysqld/libmysqld.c	Mon Jan  3 19:21:51 2005
+++ 1.65/libmysqld/libmysqld.c	Mon May  9 16:25:28 2005
@@ -199,6 +199,14 @@
   unix_socket=0;
   db_name = db ? my_strdup(db,MYF(MY_WME)) : NULL;
 
+  /* Send client information for access check */
+  client_flag|=CLIENT_CAPABILITIES;
+  if (client_flag & CLIENT_MULTI_STATEMENTS)
+    client_flag|= CLIENT_MULTI_RESULTS;
+  client_flag&= ~CLIENT_COMPRESS;
+  if (db)
+    client_flag|=CLIENT_CONNECT_WITH_DB;
+
   mysql->thd= create_embedded_thd(client_flag, db_name);
 
   init_embedded_mysql(mysql, client_flag, db_name);
@@ -209,11 +217,6 @@
   if (mysql_init_charset(mysql))
     goto error;
 
-  /* Send client information for access check */
-  client_flag|=CLIENT_CAPABILITIES;
-  client_flag&= ~CLIENT_COMPRESS;
-  if (db)
-    client_flag|=CLIENT_CONNECT_WITH_DB;
   mysql->server_status= SERVER_STATUS_AUTOCOMMIT;
 
   if (mysql->options.init_commands)