From: Mattias Jonsson
Date: January 20 2011 11:47am
Subject: bzr commit into mysql-trunk branch (mattias.jonsson:3532) Bug#59503
List-Archive: http://lists.mysql.com/commits/129270
X-Bug: 59503
Message-Id: <201101201148.p0JNTdV7005103@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1047446393=="

--===============1047446393==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///C:/mysql-bzr/b59503-trunk/ based on revid:anders.song@stripped

 3532 Mattias Jonsson	2011-01-20
      bug#59503: explain extended crash in get_mm_leaf
      
      The problem was during partitioning pruning, which does not
      use any real indexes (instead uses the partitioning function)
      so one must check if real indexes is in use before trying to
      use them.

    modified:
      mysql-test/r/partition.result
      mysql-test/t/partition.test
      sql/opt_range.cc
=== modified file 'mysql-test/r/partition.result'
--- a/mysql-test/r/partition.result	2011-01-10 16:37:47 +0000
+++ b/mysql-test/r/partition.result	2011-01-20 11:47:35 +0000
@@ -1,5 +1,18 @@
 drop table if exists t1, t2;
 #
+# Bug#59503: explain extended crash in get_mm_leaf
+#
+CREATE TABLE t1 (a VARCHAR(51) CHARACTER SET latin1)
+ENGINE=MyISAM
+PARTITION BY KEY (a) PARTITIONS 1;
+INSERT INTO t1 VALUES ('a'),('b'),('c');
+EXPLAIN EXTENDED SELECT 1 FROM t1 WHERE a > 1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
+Warnings:
+Note	1003	select 1 AS `1` from `test`.`t1` where (`test`.`t1`.`a` > 1)
+DROP TABLE t1;
+#
 # Bug#57778: failed primary key add to partitioned innodb table
 #            inconsistent and crashes
 #

=== modified file 'mysql-test/t/partition.test'
--- a/mysql-test/t/partition.test	2011-01-10 16:37:47 +0000
+++ b/mysql-test/t/partition.test	2011-01-20 11:47:35 +0000
@@ -15,6 +15,16 @@ drop table if exists t1, t2;
 --enable_warnings
 
 --echo #
+--echo # Bug#59503: explain extended crash in get_mm_leaf
+--echo #
+CREATE TABLE t1 (a VARCHAR(51) CHARACTER SET latin1)
+ENGINE=MyISAM
+PARTITION BY KEY (a) PARTITIONS 1;
+INSERT INTO t1 VALUES ('a'),('b'),('c');
+EXPLAIN EXTENDED SELECT 1 FROM t1 WHERE a > 1;
+DROP TABLE t1;
+
+--echo #
 --echo # Bug#57778: failed primary key add to partitioned innodb table
 --echo #            inconsistent and crashes
 --echo #

=== modified file 'sql/opt_range.cc'
--- a/sql/opt_range.cc	2010-12-29 00:38:59 +0000
+++ b/sql/opt_range.cc	2011-01-20 11:47:35 +0000
@@ -5774,7 +5774,8 @@ get_mm_leaf(RANGE_OPT_PARAM *param, Item
       !(conf_func->compare_collation()->state & MY_CS_BINSORT &&
         (type == Item_func::EQUAL_FUNC || type == Item_func::EQ_FUNC)))
   {
-    if (param->thd->lex->describe & DESCRIBE_EXTENDED)
+    if (param->using_real_indexes &&
+		param->thd->lex->describe & DESCRIBE_EXTENDED)
       push_warning_printf(
               param->thd,
               MYSQL_ERROR::WARN_LEVEL_WARN, 
@@ -5906,7 +5907,8 @@ get_mm_leaf(RANGE_OPT_PARAM *param, Item
       value->result_type() != STRING_RESULT &&
       field->cmp_type() != value->result_type())
   {
-    if (param->thd->lex->describe & DESCRIBE_EXTENDED)
+	  if (param->using_real_indexes &&
+		  param->thd->lex->describe & DESCRIBE_EXTENDED)
       push_warning_printf(
               param->thd,
               MYSQL_ERROR::WARN_LEVEL_WARN, 


--===============1047446393==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/mattias.jonsson@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mattias.jonsson@stripped\
#   b3oc6ez97ew2ft3l
# target_branch: file:///C:/mysql-bzr/b59503-trunk/
# testament_sha1: 9a9585ad437db087cef17b1e324adc9ed2fe7c7e
# timestamp: 2011-01-20 12:47:44 +0100
# base_revision_id: anders.song@stripped\
#   qiu8ubqy5j88wk70
# 
# Begin bundle
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
C+FXvP/i7kinChIW3fJJIA==


--===============1047446393==--