summaryrefslogtreecommitdiff
path: root/sql/share/hungarian
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 /sql/share/hungarian
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 'sql/share/hungarian')
-rw-r--r--sql/share/hungarian/errmsg.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 303032d73b2..1d76fd1d898 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -215,3 +215,4 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Wrong arguments to %s",
"%-.32s@%-.64s is not allowed to create new users",
+"Incorrect table definition; All MERGE tables must be in the same database",