summaryrefslogtreecommitdiff
path: root/sql/share/french
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-09-17 23:43:53 +0300
committermonty@hundin.mysql.fi <>2001-09-17 23:43:53 +0300
commit56cc14ab4c7cd43bbf4e39539f4c21a3d9e46808 (patch)
tree6197f5bbc2fc564444d37f990227096a4582226f /sql/share/french
parentcf80b8ae7894c21a826e800416fe7a7d3271e004 (diff)
downloadmariadb-git-56cc14ab4c7cd43bbf4e39539f4c21a3d9e46808.tar.gz
Added unique error for DEADLOCK
Include missing man pages into binary distribution
Diffstat (limited to 'sql/share/french')
-rw-r--r--sql/share/french/errmsg.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index 6dc6f150d57..a5719da6d30 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -214,3 +214,4 @@
"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",