mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

BUG#21648 information_schema test fails --with-ndbcluster

Browse source 
make test work both with and without ndbcluster


mysql-test/r/information_schema.result:
  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:
  ignore the 'cluster' database as results differ if --with-ndbcluster or without
  
  explictly use schema 'test' for bug7476 check.
This commit is contained in:
unknown 2006-08-15 15:16:21 +08:00
commit 3106a0a5f8
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
mysql-test/r/information_schema.result
View file

@ -35,7 +35,7 @@ create table t3(a int, KEY a_data (a));
create table mysqltest.t4(a int); create table mysqltest.t4(a int);
create table t5 (id int auto_increment primary key); create table t5 (id int auto_increment primary key);
insert into t5 values (10); 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 * from v1;
c c
CHARACTER_SETS CHARACTER_SETS
@ -61,7 +61,6 @@ TABLE_PRIVILEGES
TRIGGERS TRIGGERS
USER_PRIVILEGES USER_PRIVILEGES
VIEWS VIEWS
binlog_index
columns_priv columns_priv
db db
event event
@ -744,11 +743,12 @@ create view v1 as select * from t1, t2;
set @got_val= (select count(*) from information_schema.columns); set @got_val= (select count(*) from information_schema.columns);
drop view v1; drop view v1;
drop table t1, t2; drop table t1, t2;
use test;
CREATE TABLE t_crashme ( f1 BIGINT); CREATE TABLE t_crashme ( f1 BIGINT);
CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1; CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1;
CREATE VIEW a2 AS SELECT t_CRASHME FROM a1; CREATE VIEW a2 AS SELECT t_CRASHME FROM a1;
count(*) count(*)
113 68
drop view a2, a1; drop view a2, a1;
drop table t_crashme; drop table t_crashme;
select table_schema,table_name, column_name from select table_schema,table_name, column_name from
@ -845,9 +845,8 @@ VIEWS TABLE_NAME select
delete from mysql.user where user='mysqltest_4'; delete from mysql.user where user='mysqltest_4';
delete from mysql.db where user='mysqltest_4'; delete from mysql.db where user='mysqltest_4';
flush privileges; 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(*) table_schema count(*)
cluster 1
information_schema 23 information_schema 23
mysql 21 mysql 21
create table t1 (i int, j int); create table t1 (i int, j int);

8
mysql-test/t/information_schema.test
View file

@ -37,7 +37,7 @@ create table t3(a int, KEY a_data (a));
create table mysqltest.t4(a int); create table mysqltest.t4(a int);
create table t5 (id int auto_increment primary key); create table t5 (id int auto_increment primary key);
insert into t5 values (10); 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 * from v1;
select c,table_name from v1 select c,table_name from v1
@ -448,7 +448,7 @@ drop table t1, t2;
# #
# Bug #7476: crash on SELECT * FROM INFORMATION_SCHEMA.TABLES # Bug #7476: crash on SELECT * FROM INFORMATION_SCHEMA.TABLES
# #
use test;
CREATE TABLE t_crashme ( f1 BIGINT); CREATE TABLE t_crashme ( f1 BIGINT);
CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1; CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1;
CREATE VIEW a2 AS SELECT t_CRASHME FROM a1; CREATE VIEW a2 AS SELECT t_CRASHME FROM a1;
@ -462,7 +462,7 @@ while ($tab_count)
--disable_result_log --disable_result_log
SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES; SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES;
--enable_result_log --enable_result_log
SELECT count(*) FROM INFORMATION_SCHEMA.TABLES; SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='test';
let $tab_count= 65; let $tab_count= 65;
while ($tab_count) while ($tab_count)
{ {
@ -528,7 +528,7 @@ flush privileges;
# Bug #9404 information_schema: Weird error messages # Bug #9404 information_schema: Weird error messages
# with SELECT SUM() ... GROUP BY queries # 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;
# #