From e1250b86569f1fc3f634985b16892f5c702acbb7 Mon Sep 17 00:00:00 2001
From: Sergey Petrunia <psergey@askmonty.org>
Date: Thu, 25 Jun 2009 02:44:14 +0400
Subject: [PATCH] MWL#17: Table elimination - fix a typo bug in
 has_eqref_access_candidate() - Adjust test to remove race condition

mysql-test/r/mysql-bug41486.result:
  Adjust test to remove race condition
mysql-test/t/mysql-bug41486.test:
  Adjust test to remove race condition
sql/item.cc:
  MWL#17: Table elimination:
    fix a typo bug in has_eqref_access_candidate()
---
 mysql-test/r/mysql-bug41486.result | 3 +++
 mysql-test/t/mysql-bug41486.test   | 3 ++-
 sql/item.cc                        | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/mysql-bug41486.result b/mysql-test/r/mysql-bug41486.result
index 02777ab587f..62a6712eae1 100644
--- a/mysql-test/r/mysql-bug41486.result
+++ b/mysql-test/r/mysql-bug41486.result
@@ -3,6 +3,9 @@ SET @old_max_allowed_packet= @@global.max_allowed_packet;
 SET @@global.max_allowed_packet = 2 * 1024 * 1024 + 1024;
 CREATE TABLE t1(data LONGBLOB);
 INSERT INTO t1 SELECT REPEAT('1', 2*1024*1024);
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+1
 SET @old_general_log = @@global.general_log;
 SET @@global.general_log = 0;
 SET @@global.general_log = @old_general_log;
diff --git a/mysql-test/t/mysql-bug41486.test b/mysql-test/t/mysql-bug41486.test
index 6e014bca7d1..e7b0acc1935 100644
--- a/mysql-test/t/mysql-bug41486.test
+++ b/mysql-test/t/mysql-bug41486.test
@@ -27,7 +27,8 @@ connect (con1, localhost, root,,);
 
 CREATE TABLE t1(data LONGBLOB);
 INSERT INTO t1 SELECT REPEAT('1', 2*1024*1024);
-
+# The following is to remove the race between end of insert and start of MYSQL_DUMP:
+SELECT COUNT(*) FROM t1;
 let $outfile= $MYSQLTEST_VARDIR/tmp/bug41486.sql;
 --error 0,1
 remove_file $outfile;
diff --git a/sql/item.cc b/sql/item.cc
index d317b16a264..1a998ee8812 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -1935,8 +1935,9 @@ bool Item_field::check_column_usage_processor(uchar *arg)
         break;
       }
     }
+    return FALSE;
   }
-  return FALSE;
+  return TRUE;
 }
 
 const char *Item_ident::full_name() const