summaryrefslogtreecommitdiff
path: root/sql/share/japanese/errmsg.txt
diff options
context:
space:
mode:
Diffstat (limited to 'sql/share/japanese/errmsg.txt')
-rw-r--r--sql/share/japanese/errmsg.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 2f4b72f8cc1..1ed9b4aa346 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -215,6 +215,7 @@
"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",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
"Error when executing command %s: %-.128s",