bk commit into 5.0 tree (gluh:1.2399) 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, 2007-02-01 19:12:45+04:00, gluh@stripped +3 -0
  Bug#23299 Some queries against INFORMATION_SCHEMA with subqueries fail
  additional call of file->extra() method with HA_EXTRA_NO_CACHE parameter

  mysql-test/r/information_schema.result@stripped, 2007-02-01 19:12:44+04:00, gluh@stripped +10 -0
    test result

  mysql-test/t/information_schema.test@stripped, 2007-02-01 19:12:44+04:00, gluh@stripped +12 -0
    test case

  sql/sql_show.cc@stripped, 2007-02-01 19:12:44+04:00, gluh@stripped +1 -0
    additional call of file->extra() method with HA_EXTRA_NO_CACHE parameter

# 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:	eagle.(none)
# Root:	/home/gluh/MySQL/Merge/5.0-opt

--- 1.337/sql/sql_show.cc	2007-01-18 21:37:41 +04:00
+++ 1.338/sql/sql_show.cc	2007-02-01 19:12:44 +04:00
@@ -3973,6 +3973,7 @@ bool get_schema_tables_result(JOIN *join
 
       if (is_subselect) // is subselect
       {
+        table_list->table->file->extra(HA_EXTRA_NO_CACHE);
         table_list->table->file->extra(HA_EXTRA_RESET_STATE);
         table_list->table->file->delete_all_rows();
         free_io_cache(table_list->table);

--- 1.117/mysql-test/r/information_schema.result	2006-12-01 20:56:55 +04:00
+++ 1.118/mysql-test/r/information_schema.result	2007-02-01 19:12:44 +04:00
@@ -1269,3 +1269,13 @@ id	select_type	table	type	possible_keys	
 1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	0	const row not found
 2	DERIVED	tables	ALL	NULL	NULL	NULL	NULL	2	
 drop view v1;
+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-01 20:56:55 +04:00
+++ 1.89/mysql-test/t/information_schema.test	2007-02-01 19:12:44 +04:00
@@ -987,4 +987,16 @@ explain select * from v1;
 explain select * from (select table_name from information_schema.tables) as a;
 drop view v1;
 
+#
+# 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.