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.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 9674f690183..7ebce1cf662 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -307,4 +307,4 @@ character-set=ujis
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s' and '%s'"
+"Conflicting declarations: '%s%s' and '%s%s'"