bk commit into 5.1 tree (istruewing:1.2612) BUG#31210

[Ingo Struewing]

Below is the list of changes that have just been committed into a local
5.1 repository of istruewing. When istruewing 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-11-11 20:38:28+01:00, istruewing@stripped +3 -0
  Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    
  Post-pushbuild fix
    
  Pushbuild detected a new need for lex initialization in
  embedded server.
  
  Fixed test for INSERT DELAYED in partitions_hash.test so that
  it works with embedded server.

  libmysqld/lib_sql.cc@stripped, 2007-11-11 20:38:26+01:00, istruewing@stripped +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                    partitioned table
    Initialized lex for later use in open_table().

  mysql-test/r/partition_hash.result@stripped, 2007-11-11 20:38:26+01:00,
istruewing@stripped +0 -1
    Bug#31210 - INSERT DELAYED crashes server when used on
                    partitioned table
    Fixed test result for embedded server.

  mysql-test/t/partition_hash.test@stripped, 2007-11-11 20:38:26+01:00,
istruewing@stripped +3 -1
    Bug#31210 - INSERT DELAYED crashes server when used on
                    partitioned table
    Fixed test for embedded server.

diff -Nrup a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
--- a/libmysqld/lib_sql.cc	2007-10-10 02:12:09 +02:00
+++ b/libmysqld/lib_sql.cc	2007-11-11 20:38:26 +01:00
@@ -94,6 +94,7 @@ emb_advanced_command(MYSQL *mysql, enum 
   thd->current_stmt= stmt;
 
   thd->store_globals();				// Fix if more than one connect
+  lex_start(thd);
   /* 
      We have to call free_old_query before we start to fill mysql->fields 
      for new query. In the case of embedded server we collect field data
diff -Nrup a/mysql-test/r/partition_hash.result b/mysql-test/r/partition_hash.result
--- a/mysql-test/r/partition_hash.result	2007-11-05 16:25:38 +01:00
+++ b/mysql-test/r/partition_hash.result	2007-11-11 20:38:26 +01:00
@@ -185,5 +185,4 @@ c1	c2	c3
 drop table t1;
 CREATE TABLE t1 (c1 INT) ENGINE=MyISAM PARTITION BY HASH(c1) PARTITIONS 1;
 INSERT DELAYED INTO t1 VALUES (1);
-ERROR HY000: Table storage engine for 't1' doesn't have this option
 DROP TABLE t1;
diff -Nrup a/mysql-test/t/partition_hash.test b/mysql-test/t/partition_hash.test
--- a/mysql-test/t/partition_hash.test	2007-11-05 16:25:38 +01:00
+++ b/mysql-test/t/partition_hash.test	2007-11-11 20:38:26 +01:00
@@ -148,7 +148,9 @@ drop table t1;
 # Bug#31210 - INSERT DELAYED crashes server when used on partitioned table
 #
 CREATE TABLE t1 (c1 INT) ENGINE=MyISAM PARTITION BY HASH(c1) PARTITIONS 1;
---error ER_ILLEGAL_HA
+# The test succeeds in an embedded server because normal insert is done.
+# The test fails in a normal server with "engine doesn't have this option".
+--error 0, ER_ILLEGAL_HA
 INSERT DELAYED INTO t1 VALUES (1);
 DROP TABLE t1;