diff options
| author | unknown <istruewing@stella.local> | 2007-11-11 20:38:28 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2007-11-11 20:38:28 +0100 |
| commit | 076f2f732df6670a3ee7b8e290b2b66a04a77fe6 (patch) | |
| tree | bc21ea9cfae0c01a216cbc936dab8bfa08371349 | |
| parent | bb532df5584f3d2f1918835a644721e8464df623 (diff) | |
| download | mariadb-git-076f2f732df6670a3ee7b8e290b2b66a04a77fe6.tar.gz | |
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:
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:
Bug#31210 - INSERT DELAYED crashes server when used on
partitioned table
Fixed test result for embedded server.
mysql-test/t/partition_hash.test:
Bug#31210 - INSERT DELAYED crashes server when used on
partitioned table
Fixed test for embedded server.
| -rw-r--r-- | libmysqld/lib_sql.cc | 1 | ||||
| -rw-r--r-- | mysql-test/r/partition_hash.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/partition_hash.test | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 4e525f8447f..d929024483c 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -94,6 +94,7 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command, 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 --git a/mysql-test/r/partition_hash.result b/mysql-test/r/partition_hash.result index 3ebbd020db4..72f036be099 100644 --- a/mysql-test/r/partition_hash.result +++ b/mysql-test/r/partition_hash.result @@ -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 --git a/mysql-test/t/partition_hash.test b/mysql-test/t/partition_hash.test index 16c3e2b3b9b..52caaa8c8e9 100644 --- a/mysql-test/t/partition_hash.test +++ b/mysql-test/t/partition_hash.test @@ -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; |