diff options
| author | unknown <monty@work.mysql.com> | 2001-09-17 23:26:00 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-09-17 23:26:00 +0200 |
| commit | d8ae9669cd11f9c61105a9cbf19f9318a0e783fc (patch) | |
| tree | a544afdc5cdc3dba7918f6a0d8f1341a2fe74ff2 /sql/share/german | |
| parent | 9f939ecce6ccf73c5192d721d826f0a2a58a9b3e (diff) | |
| parent | 9d62e4a05b1c8399787b624a90e0cab0aa42c57c (diff) | |
| download | mariadb-git-d8ae9669cd11f9c61105a9cbf19f9318a0e783fc.tar.gz | |
merge
Docs/manual.texi:
Auto merged
extra/perror.c:
Auto merged
include/my_base.h:
Auto merged
include/mysql.h:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysqld.cc:
Auto merged
client/mysqltest.c:
Auto merged
Diffstat (limited to 'sql/share/german')
| -rw-r--r-- | sql/share/german/errmsg.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt index dd744ecab46..a9ba1f41c42 100644 --- a/sql/share/german/errmsg.txt +++ b/sql/share/german/errmsg.txt @@ -217,6 +217,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", |