bk commit into 5.1 tree (gluh:1.2619) BUG#31630

[gluh]

Below is the list of changes that have just been committed into a local
5.1 repository of gluh. When gluh does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-02 12:39:14+04:00, gluh@stripped +3 -0
  Bug#31630 debug assert with explain extended select ... from i_s
  added 'in_rows' column value for 'describe extended' for the case 
  when 'describe' handles I_S table

  mysql-test/r/information_schema.result@stripped, 2007-11-02 12:39:12+04:00, gluh@stripped +5 -0
    test result

  mysql-test/t/information_schema.test@stripped, 2007-11-02 12:39:12+04:00, gluh@stripped +5 -0
    test case

  sql/sql_select.cc@stripped, 2007-11-02 12:39:12+04:00, gluh@stripped +4 -0
    added 'in_rows' column value for 'describe extended' for the case 
    when 'describe' handles I_S table

diff -Nrup a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
--- a/mysql-test/r/information_schema.result	2007-10-29 14:47:53 +04:00
+++ b/mysql-test/r/information_schema.result	2007-11-02 12:39:12 +04:00
@@ -1604,4 +1604,9 @@ select * from `information_schema`.`VIEW
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE	CHARACTER_SET_CLIENT	COLLATION_CONNECTION
 select * from `information_schema`.`VIEWS` where `TABLE_NAME` = NULL;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE	CHARACTER_SET_CLIENT	COLLATION_CONNECTION
+explain extended select 1 from information_schema.TABLES;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	TABLES	ALL	NULL	NULL	NULL	NULL	NULL	NULL	Skip_open_table; Scanned all databases
+Warnings:
+Note	1003	select 1 AS `1` from `information_schema`.`TABLES`
 End of 5.1 tests.
diff -Nrup a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test
--- a/mysql-test/t/information_schema.test	2007-10-29 14:48:06 +04:00
+++ b/mysql-test/t/information_schema.test	2007-11-02 12:39:12 +04:00
@@ -1232,4 +1232,9 @@ select * from `information_schema`.`TRIG
 select * from `information_schema`.`VIEWS` where `TABLE_SCHEMA` = NULL;
 select * from `information_schema`.`VIEWS` where `TABLE_NAME` = NULL;
 
+#
+# Bug#31630 debug assert with explain extended select ... from i_s
+#
+explain extended select 1 from information_schema.TABLES;
+
 --echo End of 5.1 tests.
diff -Nrup a/sql/sql_select.cc b/sql/sql_select.cc
--- a/sql/sql_select.cc	2007-10-23 20:10:27 +05:00
+++ b/sql/sql_select.cc	2007-11-02 12:39:12 +04:00
@@ -15819,6 +15819,10 @@ static void select_describe(JOIN *join, 
       /* Add "rows" field to item_list. */
       if (table_list->schema_table)
       {
+        /* in_rows */
+        if (join->thd->lex->describe & DESCRIBE_EXTENDED)
+          item_list.push_back(item_null);
+        /* rows */
         item_list.push_back(item_null);
       }
       else