bk commit into 5.0 tree (jimw:1.1804)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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.1804 05/03/11 15:06:03 jimw@stripped +10 -0
  Update tests and test results after merge, disable broken NDB tests

  mysql-test/t/ndb_restore.disabled
    1.1 05/03/11 15:06:00 jimw@stripped +1 -0

  mysql-test/t/ndb_multi.disabled
    1.1 05/03/11 15:06:00 jimw@stripped +1 -0

  mysql-test/t/ndb_cache_multi2.disabled
    1.1 05/03/11 15:06:00 jimw@stripped +1 -0

  mysql-test/t/ndb_cache_multi.disabled
    1.1 05/03/11 15:06:00 jimw@stripped +1 -0

  mysql-test/t/ndb_restore.disabled
    1.0 05/03/11 15:06:00 jimw@stripped +0 -0
    BitKeeper file /home/jimw/my/mysql-5.0-clean/mysql-test/t/ndb_restore.disabled

  mysql-test/t/ndb_multi.disabled
    1.0 05/03/11 15:06:00 jimw@stripped +0 -0
    BitKeeper file /home/jimw/my/mysql-5.0-clean/mysql-test/t/ndb_multi.disabled

  mysql-test/t/ndb_cache_multi2.disabled
    1.0 05/03/11 15:06:00 jimw@stripped +0 -0
    BitKeeper file /home/jimw/my/mysql-5.0-clean/mysql-test/t/ndb_cache_multi2.disabled

  mysql-test/t/ndb_cache_multi.disabled
    1.0 05/03/11 15:06:00 jimw@stripped +0 -0
    BitKeeper file /home/jimw/my/mysql-5.0-clean/mysql-test/t/ndb_cache_multi.disabled

  mysql-test/t/ndb_autodiscover2.disabled
    1.1 05/03/11 15:05:59 jimw@stripped +1 -0

  mysql-test/t/ndb_autodiscover.disabled
    1.1 05/03/11 15:05:59 jimw@stripped +1 -0

  mysql-test/t/ndb_alter_table.disabled
    1.1 05/03/11 15:05:59 jimw@stripped +1 -0

  mysql-test/t/query_cache.test
    1.38 05/03/11 15:05:59 jimw@stripped +1 -0
    Update test result

  mysql-test/t/ndb_autodiscover2.disabled
    1.0 05/03/11 15:05:59 jimw@stripped +0 -0
    BitKeeper file /home/jimw/my/mysql-5.0-clean/mysql-test/t/ndb_autodiscover2.disabled

  mysql-test/t/ndb_autodiscover.disabled
    1.0 05/03/11 15:05:59 jimw@stripped +0 -0
    BitKeeper file /home/jimw/my/mysql-5.0-clean/mysql-test/t/ndb_autodiscover.disabled

  mysql-test/t/ndb_alter_table.disabled
    1.0 05/03/11 15:05:59 jimw@stripped +0 -0
    BitKeeper file /home/jimw/my/mysql-5.0-clean/mysql-test/t/ndb_alter_table.disabled

  mysql-test/r/query_cache.result
    1.50 05/03/11 15:05:59 jimw@stripped +1 -0
    Reset query_cache_type for test

  mysql-test/r/information_schema.result
    1.38 05/03/11 15:05:59 jimw@stripped +1 -1
    Update test result

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-clean

--- 1.37/mysql-test/r/information_schema.result	2005-03-08 17:12:52 -08:00
+++ 1.38/mysql-test/r/information_schema.result	2005-03-11 15:05:59 -08:00
@@ -505,7 +505,7 @@
 proc	definer	char(77)
 proc	created	timestamp
 proc	modified	timestamp
-proc	sql_mode	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO')
+proc	sql_mode	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE')
 proc	comment	char(64)
 drop table t115;
 create procedure p108 () begin declare c cursor for select data_type
--- New file ---
+++ mysql-test/t/ndb_alter_table.disabled	05/03/11 15:05:59
NDB team needs to fix

--- New file ---
+++ mysql-test/t/ndb_autodiscover.disabled	05/03/11 15:05:59
NDB team needs to fix

--- New file ---
+++ mysql-test/t/ndb_autodiscover2.disabled	05/03/11 15:05:59
NDB team needs to fix

--- New file ---
+++ mysql-test/t/ndb_cache_multi.disabled	05/03/11 15:06:00
NDB team needs to fix

--- New file ---
+++ mysql-test/t/ndb_cache_multi2.disabled	05/03/11 15:06:00
NDB team needs to fix

--- New file ---
+++ mysql-test/t/ndb_multi.disabled	05/03/11 15:06:00
NDB team needs to fix

--- New file ---
+++ mysql-test/t/ndb_restore.disabled	05/03/11 15:06:00
NDB team needs to fix


--- 1.49/mysql-test/r/query_cache.result	2005-03-11 12:38:35 -08:00
+++ 1.50/mysql-test/r/query_cache.result	2005-03-11 15:05:59 -08:00
@@ -957,6 +957,7 @@
 select table_name from information_schema.tables
 where table_schema="test";
 table_name
+SET SESSION query_cache_type = 1;
 set global query_cache_size=1024*1024;
 flush query cache;
 create table t1 ( a int );

--- 1.37/mysql-test/t/query_cache.test	2005-03-11 12:38:35 -08:00
+++ 1.38/mysql-test/t/query_cache.test	2005-03-11 15:05:59 -08:00
@@ -698,6 +698,7 @@
 select table_name from information_schema.tables
 where table_schema="test";
 # Bug #8480: REPAIR TABLE needs to flush the table from the query cache
+SET SESSION query_cache_type = 1;
 set global query_cache_size=1024*1024;
 flush query cache;
 create table t1 ( a int );