bk commit into 5.0 tree (gluh:1.1787) BUG#8164

[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
  1.1787 05/03/03 19:20:16 gluh@stripped +3 -0
  Fix for bug #8164: subquery with INFORMATION_SCHEMA.COLUMNS, 100 % CPU

  sql/sql_show.cc
    1.221 05/03/03 19:20:09 gluh@stripped +4 -0
    Fix for bug #8164: subquery with INFORMATION_SCHEMA.COLUMNS, 100 % CPU

  mysql-test/t/information_schema.test
    1.26 05/03/03 19:20:09 gluh@stripped +9 -0
    Fix for bug #8164: subquery with INFORMATION_SCHEMA.COLUMNS, 100 % CPU

  mysql-test/r/information_schema.result
    1.34 05/03/03 19:20:09 gluh@stripped +7 -0
    Fix for bug #8164: subquery with INFORMATION_SCHEMA.COLUMNS, 100 % CPU

# 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.mysql.r18.ru
# Root:	/home/gluh/MySQL-MERGE/mysql-5.0

--- 1.220/sql/sql_show.cc	Tue Mar  1 15:47:09 2005
+++ 1.221/sql/sql_show.cc	Thu Mar  3 19:20:09 2005
@@ -1649,6 +1649,10 @@
                                strlen(item_field->field_name), 0)))
       return 0;
   }
+  if (item->type() == Item::SUBSELECT_ITEM &&
+      !item->const_item())
+    return 0;
+
   return 1;
 }
 

--- 1.33/mysql-test/r/information_schema.result	Wed Feb 23 15:15:15 2005
+++ 1.34/mysql-test/r/information_schema.result	Thu Mar  3 19:20:09 2005
@@ -631,3 +631,10 @@
 TABLES	CHECK_TIME	datetime
 ROUTINES	CREATED	datetime
 ROUTINES	LAST_ALTERED	datetime
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES A
+WHERE NOT EXISTS 
+(SELECT * FROM INFORMATION_SCHEMA.COLUMNS B
+WHERE A.TABLE_SCHEMA = B.TABLE_SCHEMA
+AND A.TABLE_NAME = B.TABLE_NAME);
+COUNT(*)
+0

--- 1.25/mysql-test/t/information_schema.test	Wed Feb 23 15:15:15 2005
+++ 1.26/mysql-test/t/information_schema.test	Thu Mar  3 19:20:09 2005
@@ -400,3 +400,12 @@
 where data_type = 'longtext';
 select table_name, column_name, data_type from information_schema.columns
 where data_type = 'datetime';
+
+#
+# Bug #8164  subquery with INFORMATION_SCHEMA.COLUMNS, 100 % CPU
+#
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES A
+WHERE NOT EXISTS 
+(SELECT * FROM INFORMATION_SCHEMA.COLUMNS B
+  WHERE A.TABLE_SCHEMA = B.TABLE_SCHEMA
+  AND A.TABLE_NAME = B.TABLE_NAME);