List:Commits« Previous MessageNext Message »
From:Stewart Smith Date:August 15 2006 7:16am
Subject:bk commit into 5.1 tree (stewart:1.2271) BUG#21648
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart 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, 2006-08-15 15:16:21+08:00, stewart@willster.(none) +2 -0
  BUG#21648 information_schema test fails --with-ndbcluster
  
  make test work both with and without ndbcluster

  mysql-test/r/information_schema.result@stripped, 2006-08-15 15:16:18+08:00, stewart@willster.(none) +4 -5
    fix test so that it passes --with-ndbcluster
    
    add conditions to ignore the table_schema='cluster' on some queries as different
    tables are in the cluster database if ndb is running or not.

  mysql-test/t/information_schema.test@stripped, 2006-08-15 15:16:18+08:00, stewart@willster.(none) +4 -4
    ignore the 'cluster' database as results differ if --with-ndbcluster or without
    
    explictly use schema 'test' for bug7476 check.

# 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:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/ndb

--- 1.132/mysql-test/r/information_schema.result	2006-08-15 15:16:26 +08:00
+++ 1.133/mysql-test/r/information_schema.result	2006-08-15 15:16:26 +08:00
@@ -35,7 +35,7 @@
 create table mysqltest.t4(a int);
 create table t5 (id int auto_increment primary key);
 insert into t5 values (10);
-create view v1 (c) as select table_name from information_schema.TABLES;
+create view v1 (c) as select table_name from information_schema.TABLES where table_schema!='cluster';
 select * from v1;
 c
 CHARACTER_SETS
@@ -61,7 +61,6 @@
 TRIGGERS
 USER_PRIVILEGES
 VIEWS
-binlog_index
 columns_priv
 db
 event
@@ -744,11 +743,12 @@
 set @got_val= (select count(*) from information_schema.columns);
 drop view v1;
 drop table t1, t2;
+use test;
 CREATE TABLE t_crashme ( f1 BIGINT);
 CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1;
 CREATE VIEW a2 AS SELECT t_CRASHME FROM a1;
 count(*)
-113
+68
 drop view a2, a1;
 drop table t_crashme;
 select table_schema,table_name, column_name from
@@ -845,9 +845,8 @@
 delete from mysql.user where user='mysqltest_4';
 delete from mysql.db where user='mysqltest_4';
 flush privileges;
-SELECT table_schema, count(*) FROM information_schema.TABLES GROUP BY TABLE_SCHEMA;
+SELECT table_schema, count(*) FROM information_schema.TABLES where TABLE_SCHEMA!='cluster' GROUP BY TABLE_SCHEMA;
 table_schema	count(*)
-cluster	1
 information_schema	23
 mysql	21
 create table t1 (i int, j int);

--- 1.85/mysql-test/t/information_schema.test	2006-08-15 15:16:26 +08:00
+++ 1.86/mysql-test/t/information_schema.test	2006-08-15 15:16:26 +08:00
@@ -37,7 +37,7 @@
 create table mysqltest.t4(a int);
 create table t5 (id int auto_increment primary key);
 insert into t5 values (10);
-create view v1 (c) as select table_name from information_schema.TABLES;
+create view v1 (c) as select table_name from information_schema.TABLES where table_schema!='cluster';
 select * from v1;
 
 select c,table_name from v1 
@@ -448,7 +448,7 @@
 #
 # Bug #7476: crash on SELECT * FROM INFORMATION_SCHEMA.TABLES
 #
-
+use test;
 CREATE TABLE t_crashme ( f1 BIGINT);
 CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1;
 CREATE VIEW a2 AS SELECT t_CRASHME FROM a1;
@@ -462,7 +462,7 @@
 --disable_result_log
 SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES;
 --enable_result_log
-SELECT count(*) FROM INFORMATION_SCHEMA.TABLES;
+SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='test';
 let $tab_count= 65;
 while ($tab_count)
 {
@@ -528,7 +528,7 @@
 # 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;
+SELECT table_schema, count(*) FROM information_schema.TABLES where TABLE_SCHEMA!='cluster' GROUP BY TABLE_SCHEMA;
 
 
 #
Thread
bk commit into 5.1 tree (stewart:1.2271) BUG#21648Stewart Smith15 Aug