summaryrefslogtreecommitdiff
path: root/sql/share
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 /sql/share
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 'sql/share')
-rw-r--r--sql/share/errmsg.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index e03371a308b..426290714eb 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -6130,3 +6130,6 @@ ER_LOG_PURGE_NO_FILE
ER_NEED_REPREPARE
eng "Prepared statement needs to be re-prepared"
+
+ER_DELAYED_NOT_SUPPORTED
+ eng "DELAYED option not supported for table '%-.192s'"