From 7560f3bae729f4ef3fb3a6d1061483a7b3345bbd Mon Sep 17 00:00:00 2001
From: "heikki@hundin.mysql.fi" <>
Date: Thu, 8 Apr 2004 09:25:48 +0300
Subject: [PATCH] sql_select.cc:   Fix a glitch reported by Philippe Lewicki on
 the general mailing list: do not print a warning to the .err log if read_key
 fails with a lock wait timeout error 146

---
 sql/sql_select.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 057f0bd9483..b299e3af0b7 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -4995,7 +4995,8 @@ join_read_key(JOIN_TAB *tab)
 				  tab->ref.key_length,HA_READ_KEY_EXACT);
     if (error && error != HA_ERR_KEY_NOT_FOUND)
     {
-      sql_print_error("read_key: Got error %d when reading table '%s'",error,
+      if (error != HA_ERR_LOCK_DEADLOCK && error != HA_ERR_LOCK_WAIT_TIMEOUT)
+        sql_print_error("read_key: Got error %d when reading table '%s'",error,
 		      table->path);
       table->file->print_error(error,MYF(0));
       return 1;