diff options
| author | Mattias Jonsson <mattiasj@mysql.com> | 2008-06-03 13:25:41 +0200 |
|---|---|---|
| committer | Mattias Jonsson <mattiasj@mysql.com> | 2008-06-03 13:25:41 +0200 |
| commit | a8af693b5031019646c5bdffa50df760123182e5 (patch) | |
| tree | b16830a525163b32894bb97f2bb0546f6dfa0daf /mysql-test/t/merge.test | |
| parent | c392457f7c234f55dfb74104771b216b15458383 (diff) | |
| download | mariadb-git-a8af693b5031019646c5bdffa50df760123182e5.tar.gz | |
Bug#31210: INSERT DELAYED crashes server when used on partitioned tables
Problem was an unclear error message since it could suggest that
MyISAM did not support INSERT DELAYED.
Changed the error message to say that DELAYED is not supported by the
table, instead of the table's storage engine.
The confusion is that a partitioned table is in somewhat sense using
the partitioning storage engine, which in turn uses the ordinary
storage engine. By saying that the table does not support DELAYED we
do not give any extra informantion about the storage engine or if it
is partitioned.
mysql-test/r/innodb-replace.result:
Bug#31210: INSERT DELAYED crashes server when used on partitioned tables
changed error message
mysql-test/t/innodb-replace.test:
Bug#31210: INSERT DELAYED crashes server when used on partitioned tables
changed error message
mysql-test/t/merge.test:
Bug#31210: INSERT DELAYED crashes server when used on partitioned tables
changed error message
mysql-test/t/partition_hash.test:
Bug#31210: INSERT DELAYED crashes server when used on partitioned tables
changed error message
sql/share/errmsg.txt:
Bug#31210: INSERT DELAYED crashes server when used on partitioned tables
added error message for tables not supporting DELAYED
sql/sql_insert.cc:
Bug#31210: INSERT DELAYED crashes server when used on partitioned tables
changed error message
Diffstat (limited to 'mysql-test/t/merge.test')
| -rw-r--r-- | mysql-test/t/merge.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index 76e746db037..fd1336491aa 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -1201,7 +1201,7 @@ UNLOCK TABLES; # Succeeds in embedded server - is converted to normal insert # Fails in normal server, ps-protocol - not supported by engine # Fails in normal server, normal protocol - not a base table ---error 0, ER_ILLEGAL_HA, ER_WRONG_OBJECT +--error 0, ER_DELAYED_NOT_SUPPORTED, ER_WRONG_OBJECT INSERT DELAYED INTO t4 VALUES(44); # Get rid of row in embedded server DELETE FROM t4 WHERE c1 = 44; @@ -1214,9 +1214,9 @@ INSERT DELAYED INTO t3 VALUES(33); } SELECT * FROM t4 ORDER BY c1; LOCK TABLES t3 WRITE, t2 WRITE, t4 WRITE, t1 WRITE; ---error ER_DELAYED_INSERT_TABLE_LOCKED, ER_ILLEGAL_HA +--error ER_DELAYED_INSERT_TABLE_LOCKED, ER_DELAYED_NOT_SUPPORTED INSERT DELAYED INTO t4 VALUES(444); ---error ER_DELAYED_INSERT_TABLE_LOCKED, ER_ILLEGAL_HA +--error ER_DELAYED_INSERT_TABLE_LOCKED, ER_DELAYED_NOT_SUPPORTED INSERT DELAYED INTO t3 VALUES(333); SELECT * FROM t4 ORDER BY c1; UNLOCK TABLES; |