summaryrefslogtreecommitdiff
path: root/sql/share/english
diff options
context:
space:
mode:
authormonty@donna.mysql.fi <>2001-10-30 17:38:44 +0200
committermonty@donna.mysql.fi <>2001-10-30 17:38:44 +0200
commit7fcbd7e3da3920a7e4d5c1a2b4c4f824fffe33ef (patch)
tree097886eb981160413975cb915243d4ae60718154 /sql/share/english
parentd4dd3b09b8917fcc8233d8f43bfbf5ab4b98cc8b (diff)
downloadmariadb-git-7fcbd7e3da3920a7e4d5c1a2b4c4f824fffe33ef.tar.gz
Merge
Diffstat (limited to 'sql/share/english')
-rw-r--r--sql/share/english/errmsg.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index dbf0e70d5f9..895a34abafe 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -215,4 +215,15 @@
"%-.32s@%-.64s is not allowed to create new users",
"Incorrect table definition; All MERGE tables must be in the same database",
"Deadlock found when trying to get lock; Try restarting transaction",
+"Dummy error message: this error number should only occur in MySQL-4",
+"Dummy error message: this error number should only occur in MySQL-4",
+"Dummy error message: this error number should only occur in MySQL-4",
+"Dummy error message: this error number should only occur in MySQL-4",
+"Dummy error message: this error number should only occur in MySQL-4",
+"Dummy error message: this error number should only occur in MySQL-4",
+"Dummy error message: this error number should only occur in MySQL-4",
+"Dummy error message: this error number should only occur in MySQL-4",
"The used table type doesn't support FULLTEXT indexes",
+"Cannot add foreign key constraint",
+"Cannot add a child row: a foreign key constraint fails",
+"Cannot delete a parent row: a foreign key constraint fails", \ No newline at end of file