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

26 files changed, 33 insertions, 4 deletions

diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc
index 10866a1872b..e9cd3f57122 100644
--- a/sql/ha_berkeley.cc
+++ b/sql/ha_berkeley.cc
@@ -1996,6 +1996,12 @@ longlong ha_berkeley::get_auto_increment()
   return nr;
 }
 
+void ha_berkeley::print_error(int error, myf errflag)
+{
+  if (error == DB_LOCK_DEADLOCK)
+    error=HA_ERR_LOCK_DEADLOCK;
+  handler::print_error(error,errflag);
+}
 
 /****************************************************************************
 	 Analyzing, checking, and optimizing tables
diff --git a/sql/ha_berkeley.h b/sql/ha_berkeley.h
index fda7d2f2069..cc193aba485 100644
--- a/sql/ha_berkeley.h
+++ b/sql/ha_berkeley.h
@@ -162,6 +162,7 @@ class ha_berkeley: public handler
     pthread_mutex_unlock(&share->mutex);
   }
   longlong get_auto_increment();
+  void print_error(int error, myf errflag);
 };
 
 extern bool berkeley_skip, berkeley_shared_data;
diff --git a/sql/handler.h b/sql/handler.h
index 4ce743a5edd..a4b2ddc00e7 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -215,7 +215,7 @@ public:
   int ha_open(const char *name, int mode, int test_if_locked);
   void update_timestamp(byte *record);
   void update_auto_increment();
-  void print_error(int error, myf errflag);
+  virtual void print_error(int error, myf errflag);
   uint get_dup_key(int error);
   void change_table_ptr(TABLE *table_arg) { table=table_arg; }
   virtual double scan_time()
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index ee72bdb1c3b..a124eea7807 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2325,7 +2325,7 @@ pthread_handler_decl(handle_connections_sockets,arg __attribute__((unused)))
     if (!(test_flags & TEST_BLOCKING))
       fcntl(sock, F_SETFL, flags);
 #endif
-    if (new_sock < 0)
+    if (new_sock == INVALID_SOCKET)
     {
       if ((error_count++ & 255) == 0)		// This can happen often
 	sql_perror("Error in accept");
diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 1ca2aa9b02b..9d514d26fce 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -223,3 +223,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",
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index e6c828625eb..4247feb7ed4 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -217,3 +217,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",
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index abaa475402e..ff8c729f445 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -218,3 +218,4 @@
 "Foutieve parameters voor %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",
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 7fc0928d67d..faded099c2d 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -206,7 +206,7 @@
 "Could not create slave thread, check system resources",
 "User %-.64s has already more than 'max_user_connections' active connections",
 "You may only use constant expressions with SET",
-"Lock wait timeout exceeded",
+"Lock wait timeout exceeded; Try restarting transaction",
 "The total number of locks exceeds the lock table size",
 "Update locks cannot be acquired during a READ UNCOMMITTED transaction",
 "DROP DATABASE not allowed while thread is holding global read lock",
@@ -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",
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index d9c98fa919d..ee229cec589 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -218,3 +218,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",
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",
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 262390d42ea..6181ece9e33 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -217,3 +217,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",
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index 146f196852b..a81608ab1d8 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/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",
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 1d76fd1d898..e6ffe66ca8e 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/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",
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 79e8c8aed8b..9c31c70a733 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/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",
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 2971882d431..fbf92c0837a 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/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",
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index 7fbc60b8953..c83aaad8235 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/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",
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",
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index cc04859d99d..a4ef04c0b1a 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/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",
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index 989c1f7f45d..81a574fdf49 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -218,3 +218,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",
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index 82670f503b0..46b72025f1e 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -214,3 +214,4 @@
 "Argumentos errados para %s",
 "Não é permitido a %-.32s@%-.64s criar novos usuários",
 "Incorrect table definition; All MERGE tables must be in the same database",
+"Deadlock found when trying to get lock; Try restarting transaction",
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index ba214e540e6..0b2b172811e 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -218,3 +218,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",
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index 94889100847..3ab9c76aa6f 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -217,3 +217,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",
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 652f50c77c8..d700398c2dc 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -222,3 +222,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",
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 271b362f63f..c786ccb9ece 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -215,3 +215,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",
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 1eb3e9db1e7..9286aba66e4 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -206,7 +206,7 @@
 "Kunde inte starta en tråd för replikering",
 "Användare '%-.64s' har redan 'max_user_connections' aktiva inloggningar",
 "Man kan endast använda konstant-uttryck med SET",
-"Fick inte ett lås i tid",
+"Fick inte ett lås i tid ; Försök att starta om transaktionen",
 "Antal lås överskrider antalet reserverade lås",
 "Updaterings-lås kan inte göras när man använder READ UNCOMMITTED",
 "DROP DATABASE är inte tillåtet när man har ett globalt läs-lås",
@@ -214,3 +214,4 @@
 "Felaktiga argument till %s",
 "%-.32s@%-.64s har inte rättigheter att skapa nya användare",
 "Felaktig tabell definition: Alla tabeller i en MERGE tabell måste vara i samma databas",
+"Fick 'DEADLOCK' vid låsförsök av block/rad; Försök att starta om transaktionen",
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index db17f88f2c2..000f3114cda 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -219,3 +219,4 @@
 "èÉÂÎÉÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %s",
 "ëÏÒÉÓÔÕ×ÁÞÕ %-.32s@%-.64s ÎÅ ÄÏÚ×ÏÌÅÎÏ ÓÔ×ÏÒÀ×ÁÔÉ ÎÏ×ÉÈ ËÏÒÉÓÔÕ×ÁÞ¦×",
 "Incorrect table definition; All MERGE tables must be in the same database",
+"Deadlock found when trying to get lock; Try restarting transaction",