summaryrefslogtreecommitdiff
path: root/sql/share/hungarian
diff options
context:
space:
mode:
authormonty@work.mysql.com <>2001-09-17 23:26:00 +0200
committermonty@work.mysql.com <>2001-09-17 23:26:00 +0200
commiteb9cbe2cba89f696e782c53f8ce668a8f301cc31 (patch)
treea544afdc5cdc3dba7918f6a0d8f1341a2fe74ff2 /sql/share/hungarian
parent51c9fd9c9da9667b141093aa1324c61bf2f58f48 (diff)
parentdb61a3456e89d3afeb9494b4ef9185435bc55b86 (diff)
downloadmariadb-git-eb9cbe2cba89f696e782c53f8ce668a8f301cc31.tar.gz
merge
Diffstat (limited to 'sql/share/hungarian')
-rw-r--r--sql/share/hungarian/errmsg.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 6e1d1af015e..5cc5ac663b1 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -216,6 +216,7 @@
"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",
+"Deadlock found when trying to get lock; Try restarting transaction",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
"Error when executing command %s: %-.128s",