bk commit into 5.0 tree (gluh:1.2327) BUG#23299

[gluh]

Below is the list of changes that have just been committed into a local
5.0 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, 2006-12-12 13:49:27+04:00, gluh@stripped +3 -0
  Bug#23299 Some queries against INFORMATION_SCHEMA with subqueries fail
  For subqueries we should clear MI_INFO state
  which can be changed during execution of 
  init_read_record function.
  HA_EXTRA_RESET_STATE is replaced with HA_EXTRA_RESET.

  mysql-test/r/information_schema.result@stripped, 2006-12-12 13:49:24+04:00, gluh@stripped
+10 -0
    test case

  mysql-test/t/information_schema.test@stripped, 2006-12-12 13:49:24+04:00, gluh@stripped +12
-0
    test case

  sql/sql_show.cc@stripped, 2006-12-12 13:49:24+04:00, gluh@stripped +1 -1
    HA_EXTRA_RESET_STATE is replaced with HA_EXTRA_RESET.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gluh
# Host:	gluh.(none)
# Root:	/home/gluh/MySQL/Bugs/5.0.24630

--- 1.334/sql/sql_show.cc	2006-12-12 13:49:40 +04:00
+++ 1.335/sql/sql_show.cc	2006-12-12 13:49:40 +04:00
@@ -3985,7 +3985,7 @@ bool get_schema_tables_result(JOIN *join
       */
       if (table_list->is_schema_table_processed && is_subselect)
       {
-        table_list->table->file->extra(HA_EXTRA_RESET_STATE);
+        table_list->table->file->extra(HA_EXTRA_RESET);
         table_list->table->file->delete_all_rows();
         free_io_cache(table_list->table);
         filesort_free_buffers(table_list->table,1);

--- 1.117/mysql-test/r/information_schema.result	2006-12-12 13:49:40 +04:00
+++ 1.118/mysql-test/r/information_schema.result	2006-12-12 13:49:40 +04:00
@@ -1306,3 +1306,13 @@ TABLE_PRIVILEGES	information_schema.TABL
 TRIGGERS	information_schema.TRIGGERS	1
 USER_PRIVILEGES	information_schema.USER_PRIVILEGES	1
 VIEWS	information_schema.VIEWS	1
+create table t1 (f1 int(11));
+create table t2 (f1 int(11), f2 int(11));
+select table_name from information_schema.tables
+where table_schema = 'test' and table_name not in
+(select table_name from information_schema.columns
+where table_schema = 'test' and column_name = 'f3');
+table_name
+t1
+t2
+drop table t1,t2;

--- 1.88/mysql-test/t/information_schema.test	2006-12-12 13:49:40 +04:00
+++ 1.89/mysql-test/t/information_schema.test	2006-12-12 13:49:40 +04:00
@@ -1010,4 +1010,16 @@ where t.table_schema = 'information_sche
           group by c2.column_type order by num limit 1)
 group by t.table_name order by num1, t.table_name;
 
+#
+# Bug#23299 Some queries against INFORMATION_SCHEMA with subqueries fail
+#
+create table t1 (f1 int(11));
+create table t2 (f1 int(11), f2 int(11));
+
+select table_name from information_schema.tables
+where table_schema = 'test' and table_name not in
+(select table_name from information_schema.columns
+ where table_schema = 'test' and column_name = 'f3');
+drop table t1,t2;
+ 
 # End of 5.0 tests.