summaryrefslogtreecommitdiff
path: root/sql/share/english/errmsg.txt
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-08-29 17:34:46 +0300
committerunknown <monty@hundin.mysql.fi>2001-08-29 17:34:46 +0300
commitf78df02a720e621c3a41913f417e925be6456fc6 (patch)
tree2eba44a8a9c82879a50d9f428c4b2cde95c27771 /sql/share/english/errmsg.txt
parentd46365fb0ffc1b04c8ff4bc6603028b8a493954a (diff)
parent1241395fce6c953f38b5940978593f3705e2666d (diff)
downloadmariadb-git-f78df02a720e621c3a41913f417e925be6456fc6.tar.gz
Merge
Docs/manual.texi: SCCS merged
Diffstat (limited to 'sql/share/english/errmsg.txt')
-rw-r--r--sql/share/english/errmsg.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 80b99c58940..7fc0928d67d 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -213,3 +213,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",