summaryrefslogtreecommitdiff
path: root/sql/share/english/errmsg.txt
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-02-16 09:41:13 +0200
committerunknown <monty@mysql.com>2004-02-16 09:41:13 +0200
commit8637a78ad1b8d7c99ff73adb88ffc58d9f3d291e (patch)
treea63f411c88c931d607c260c2b05e1264153c65c1 /sql/share/english/errmsg.txt
parent42ad012ba70f8a571172bb27d1c28ad0a51e3388 (diff)
downloadmariadb-git-8637a78ad1b8d7c99ff73adb88ffc58d9f3d291e.tar.gz
Cleanup + safety comment
sql/share/english/errmsg.txt: Added note to ensure that no one adds new error message to 4.0. This is important as it causes too many problems with test suite in 4.1 sql/sql_load.cc: Removed wrong comment.
Diffstat (limited to 'sql/share/english/errmsg.txt')
-rw-r--r--sql/share/english/errmsg.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 7104eb64d56..dca9311b277 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -238,5 +238,7 @@
"Wrong usage/placement of '%s'",
"This version of MySQL doesn't yet support '%s'",
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
-"Slave SQL thread ignored the query because of replicate-*-table rules"
+"Slave SQL thread ignored the query because of replicate-*-table rules",
"Variable '%-.64s' is a %s variable"
+] # End of error messages
+# Do NOT add new error messages here as this makes merges to 4.1 too hard!