bk commit into 5.1 tree (tulin:1.1839)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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.1839 05/05/10 15:43:53 tulin@stripped +2 -0
  information_schema.test:
    make testresult independent of ndb  or not
  information_schema.result:
    make testresult independent of nsb or not

  mysql-test/t/information_schema.test
    1.38 05/05/10 15:43:05 ndbdev@stripped +1 -0
    make testresult independent of ndb  or not

  mysql-test/r/information_schema.result
    1.46 05/05/10 15:42:47 ndbdev@stripped +3 -2
    make testresult independent of nsb or not

# 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:	tulin
# Host:	dl145c.mysql.com
# Root:	/home/ndbdev/tomas/mysql-5.1-wl2325

--- 1.45/mysql-test/r/information_schema.result	Mon May  9 23:17:22 2005
+++ 1.46/mysql-test/r/information_schema.result	Tue May 10 15:42:47 2005
@@ -754,5 +754,6 @@
 flush privileges;
 SELECT table_schema, count(*) FROM information_schema.TABLES GROUP BY TABLE_SCHEMA;
 table_schema	count(*)
-information_schema	15
-mysql	17
+cluster_replication	<count>
+information_schema	<count>
+mysql	<count>

--- 1.37/mysql-test/t/information_schema.test	Mon May  9 23:17:22 2005
+++ 1.38/mysql-test/t/information_schema.test	Tue May 10 15:43:05 2005
@@ -493,5 +493,6 @@
 # Bug #9404  information_schema: Weird error messages
 # with SELECT SUM() ... GROUP BY queries
 #
+-- replace_column 2 <count>
 SELECT table_schema, count(*) FROM information_schema.TABLES GROUP BY TABLE_SCHEMA;