bk commit into 5.0 tree (gluh:1.1957)

[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.1957 05/05/09 17:21:44 gluh@stripped +2 -0
  manual merge

  mysql-test/t/information_schema.test
    1.36 05/05/09 17:21:39 gluh@stripped +7 -6
    manual merge

  mysql-test/r/information_schema.result
    1.50 05/05/09 17:21:39 gluh@stripped +5 -4
    manual merge

# 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:	mobby.(none)
# Root:	/home/gluh/MySQL/Bugs/5.0.9404/RESYNC

--- 1.49/mysql-test/r/information_schema.result	2005-05-07 15:14:28 +00:00
+++ 1.50/mysql-test/r/information_schema.result	2005-05-09 17:21:39 +00:00
@@ -748,3 +748,8 @@
 KEY_COLUMN_USAGE	TABLE_NAME	select
 delete from mysql.user where user='mysqltest_4';
 flush privileges;
+SELECT table_schema, count(*) FROM information_schema.TABLES GROUP BY TABLE_SCHEMA;
+table_schema    count(*)
+information_schema      15
+mysql   17
+

--- 1.35/mysql-test/t/information_schema.test	2005-05-07 15:14:28 +00:00
+++ 1.36/mysql-test/t/information_schema.test	2005-05-09 17:21:39 +00:00
@@ -1,4 +1,4 @@
-# This test uses grants, which can't get tested for embedded server
+# This test  uses grants, which can't get tested for embedded server
 -- source include/not_embedded.inc
 
 # Test for information_schema.schemata &
@@ -486,3 +486,10 @@
 connection default;
 delete from mysql.user where user='mysqltest_4';
 flush privileges;
+
+#
+# Bug #9404  information_schema: Weird error messages
+# with SELECT SUM() ... GROUP BY queries
+#
+SELECT table_schema, count(*) FROM information_schema.TABLES GROUP BY TABLE_SCHEMA;
+