summaryrefslogtreecommitdiff
path: root/mysql-test/r/innodb-replace.result
diff options
context:
space:
mode:
authorMattias Jonsson <mattiasj@mysql.com>2008-06-03 13:25:41 +0200
committerMattias Jonsson <mattiasj@mysql.com>2008-06-03 13:25:41 +0200
commita8af693b5031019646c5bdffa50df760123182e5 (patch)
treeb16830a525163b32894bb97f2bb0546f6dfa0daf /mysql-test/r/innodb-replace.result
parentc392457f7c234f55dfb74104771b216b15458383 (diff)
downloadmariadb-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/r/innodb-replace.result')
-rw-r--r--mysql-test/r/innodb-replace.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/innodb-replace.result b/mysql-test/r/innodb-replace.result
index 77e0aeb38fd..c926bb89a2e 100644
--- a/mysql-test/r/innodb-replace.result
+++ b/mysql-test/r/innodb-replace.result
@@ -3,11 +3,11 @@ create table t1 (c1 char(5) unique not null, c2 int, stamp timestamp) engine=inn
select * from t1;
c1 c2 stamp
replace delayed into t1 (c1, c2) values ( "text1","11");
-ERROR HY000: Table storage engine for 't1' doesn't have this option
+ERROR HY000: DELAYED option not supported for table 't1'
select * from t1;
c1 c2 stamp
replace delayed into t1 (c1, c2) values ( "text1","12");
-ERROR HY000: Table storage engine for 't1' doesn't have this option
+ERROR HY000: DELAYED option not supported for table 't1'
select * from t1;
c1 c2 stamp
drop table t1;