From 0da66a091b3e5dcc68d304c7b91ecf08368d34c5 Mon Sep 17 00:00:00 2001
From: Georgi Kodinov <joro@sun.com>
Date: Thu, 15 Oct 2009 14:48:12 +0300
Subject: [PATCH 1/2] version change

---
 .bzr-mysql/default.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.bzr-mysql/default.conf b/.bzr-mysql/default.conf
index e613cefc614..f044f8e62da 100644
--- a/.bzr-mysql/default.conf
+++ b/.bzr-mysql/default.conf
@@ -1,4 +1,4 @@
 [MYSQL]
 post_commit_to = "commits@lists.mysql.com"
 post_push_to = "commits@lists.mysql.com"
-tree_name = "mysql-5.1-bugteam"
+tree_name = "mysql-5.1"

From d80e35f26f814bd8c9f976e510e5b2dbda654d12 Mon Sep 17 00:00:00 2001
From: Georgi Kodinov <joro@sun.com>
Date: Fri, 16 Oct 2009 11:42:16 +0300
Subject: [PATCH 2/2] Revert the fix for bug #47123 until test suite failures
 are resolved.

---
 mysql-test/r/range.result |  9 ---------
 mysql-test/t/range.test   | 11 -----------
 sql/opt_range.cc          | 11 -----------
 3 files changed, 31 deletions(-)

diff --git a/mysql-test/r/range.result b/mysql-test/r/range.result
index 0d44e79b39a..c98a7696ea6 100644
--- a/mysql-test/r/range.result
+++ b/mysql-test/r/range.result
@@ -1398,12 +1398,3 @@ a < 10;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t3	range	a	a	5	NULL	8	Using where; Using index
 DROP TABLE t1, t2, t3;
-#
-# Bug #47123: Endless 100% CPU loop with STRAIGHT_JOIN
-#
-CREATE TABLE t1(a INT, KEY(a));
-INSERT INTO t1 VALUES (1), (NULL);
-SELECT * FROM t1 WHERE a <> NULL and (a <> NULL or a <= NULL);
-a
-DROP TABLE t1;
-End of 5.1 tests
diff --git a/mysql-test/t/range.test b/mysql-test/t/range.test
index f0fa99f3d95..dc119b6a77e 100644
--- a/mysql-test/t/range.test
+++ b/mysql-test/t/range.test
@@ -1171,14 +1171,3 @@ a < 5 OR
 a < 10;
 
 DROP TABLE t1, t2, t3;
-
---echo #
---echo # Bug #47123: Endless 100% CPU loop with STRAIGHT_JOIN
---echo #
-
-CREATE TABLE t1(a INT, KEY(a));
-INSERT INTO t1 VALUES (1), (NULL);
-SELECT * FROM t1 WHERE a <> NULL and (a <> NULL or a <= NULL);
-DROP TABLE t1;
-
---echo End of 5.1 tests
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 04dae4fd815..119f90bc97a 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -5891,17 +5891,6 @@ get_mm_leaf(RANGE_OPT_PARAM *param, COND *conf_func, Field *field,
     goto end;
   }
   field->table->in_use->variables.sql_mode= orig_sql_mode;
-
-  /*
-    Any sargable predicate except "<=>" involving NULL as a constant is always
-    FALSE
-  */
-  if (type != Item_func::EQUAL_FUNC && field->is_real_null())
-  {
-    tree= &null_element;
-    goto end;
-  }
-  
   str= (uchar*) alloc_root(alloc, key_part->store_length+1);
   if (!str)
     goto end;