From ffe994614f09f79104a20fe75b1e2986d062523a Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 17 Sep 2001 23:43:53 +0300 Subject: Added unique error for DEADLOCK Include missing man pages into binary distribution BitKeeper/deleted/.del-make_mysql_pkg.sh~c616a18bed4b9c2: Delete: support-files/make_mysql_pkg.sh Docs/manual.texi: Changelog extra/perror.c: Added missing error codes include/my_base.h: Added unique error for DEADLOCK include/mysql.h: Portability fix for the LCC windows compiler include/mysqld_error.h: Added unique error for DEADLOCK scripts/make_binary_distribution.sh: Include missing man pages into binary distribution sql/ha_berkeley.cc: Added unique error for DEADLOCK sql/ha_berkeley.h: Added unique error for DEADLOCK sql/handler.h: Added unique error for DEADLOCK sql/mysqld.cc: Portability fix sql/share/czech/errmsg.txt: Added unique error for DEADLOCK sql/share/danish/errmsg.txt: Added unique error for DEADLOCK sql/share/dutch/errmsg.txt: Added unique error for DEADLOCK sql/share/english/errmsg.txt: Added unique error for DEADLOCK sql/share/estonian/errmsg.txt: Added unique error for DEADLOCK sql/share/french/errmsg.txt: Added unique error for DEADLOCK sql/share/german/errmsg.txt: Added unique error for DEADLOCK sql/share/greek/errmsg.txt: Added unique error for DEADLOCK sql/share/hungarian/errmsg.txt: Added unique error for DEADLOCK sql/share/italian/errmsg.txt: Added unique error for DEADLOCK sql/share/japanese/errmsg.txt: Added unique error for DEADLOCK sql/share/korean/errmsg.txt: Added unique error for DEADLOCK sql/share/norwegian-ny/errmsg.txt: Added unique error for DEADLOCK sql/share/norwegian/errmsg.txt: Added unique error for DEADLOCK sql/share/polish/errmsg.txt: Added unique error for DEADLOCK sql/share/portuguese/errmsg.txt: Added unique error for DEADLOCK sql/share/romanian/errmsg.txt: Added unique error for DEADLOCK sql/share/russian/errmsg.txt: Added unique error for DEADLOCK sql/share/slovak/errmsg.txt: Added unique error for DEADLOCK sql/share/spanish/errmsg.txt: Added unique error for DEADLOCK sql/share/swedish/errmsg.txt: Added unique error for DEADLOCK sql/share/ukrainian/errmsg.txt: Added unique error for DEADLOCK --- sql/share/norwegian-ny/errmsg.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'sql/share/norwegian-ny') diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt index 9fb3f5f5666..a4f45dcb12a 100644 --- a/sql/share/norwegian-ny/errmsg.txt +++ b/sql/share/norwegian-ny/errmsg.txt @@ -216,3 +216,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", -- cgit v1.2.1