summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-08-29 17:33:41 +0300
committerunknown <monty@hundin.mysql.fi>2001-08-29 17:33:41 +0300
commit1241395fce6c953f38b5940978593f3705e2666d (patch)
tree3d579fb9d02e1fa69457e4ec1706fb325190d90c /include
parentbfe2213babce74eac616dd3be0c8ac5bce16f032 (diff)
downloadmariadb-git-1241395fce6c953f38b5940978593f3705e2666d.tar.gz
Test that all MERGE tables comes from the same database
Docs/manual.texi: Changelog and more documentation about ALTER TABLE include/mysqld_error.h: New error message mysql-test/t/merge.test: Test of error conditions sql/gen_lex_hash.cc: Smaller array sql/ha_myisammrg.cc: Cleanup sql/share/czech/errmsg.txt: New message sql/share/danish/errmsg.txt: New message sql/share/dutch/errmsg.txt: New message sql/share/english/errmsg.txt: New message sql/share/estonian/errmsg.txt: New message sql/share/french/errmsg.txt: New message sql/share/german/errmsg.txt: New message sql/share/greek/errmsg.txt: New message sql/share/hungarian/errmsg.txt: New message sql/share/italian/errmsg.txt: New message sql/share/japanese/errmsg.txt: New message sql/share/korean/errmsg.txt: New message sql/share/norwegian-ny/errmsg.txt: New message sql/share/norwegian/errmsg.txt: New message sql/share/polish/errmsg.txt: New message sql/share/portuguese/errmsg.txt: New message sql/share/romanian/errmsg.txt: New message sql/share/russian/errmsg.txt: New message sql/share/slovak/errmsg.txt: New message sql/share/spanish/errmsg.txt: New message sql/share/swedish/errmsg.txt: New message
Diffstat (limited to 'include')
-rw-r--r--include/mysqld_error.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h
index 758c74fc122..08e621f4a2a 100644
--- a/include/mysqld_error.h
+++ b/include/mysqld_error.h
@@ -212,4 +212,5 @@
#define ER_CREATE_DB_WITH_READ_LOCK 1209
#define ER_WRONG_ARGUMENTS 1210
#define ER_NO_PERMISSON_TO_CREATE_USER 1211
-#define ER_ERROR_MESSAGES 212
+#define ER_UNION_TABLES_IN_DIFFERENT_DIR 1212
+#define ER_ERROR_MESSAGES 213