mirror of
https://github.com/MariaDB/server.git
synced 2025-07-02 14:22:51 +03:00
"normal" warning in test suite disabled
bad merge fixed
This commit is contained in:
@ -71,24 +71,6 @@ show full columns from t1;
|
||||
show index from t1;
|
||||
drop table t1,t2;
|
||||
|
||||
#
|
||||
# Test of some show commands
|
||||
#
|
||||
|
||||
create table t1 (a int not null primary key, b int not null,c int not null, key(b,c));
|
||||
insert into t1 values (1,2,2),(2,2,3),(3,2,4),(4,2,4);
|
||||
create table t2 type=isam select * from t1;
|
||||
optimize table t1;
|
||||
check table t1,t2;
|
||||
repair table t1,t2;
|
||||
check table t2,t1;
|
||||
lock tables t1 write;
|
||||
check table t2,t1;
|
||||
show columns from t1;
|
||||
show full columns from t1;
|
||||
show index from t1;
|
||||
drop table t1,t2;
|
||||
|
||||
#
|
||||
# test of table with huge number of packed fields
|
||||
#
|
||||
|
@ -6,8 +6,8 @@ connect (con2,localhost,root,,);
|
||||
connection con1;
|
||||
--disable_warnings
|
||||
drop table if exists t1;
|
||||
--enable_warnings
|
||||
create table t1(a int) type=innodb;
|
||||
--enable_warnings
|
||||
lock tables t1 write;
|
||||
insert into t1 values(10);
|
||||
disconnect con1;
|
||||
|
@ -892,9 +892,11 @@ DROP TABLE t1, t2;
|
||||
#
|
||||
# UNION unlocking test
|
||||
#
|
||||
--disable_warnings
|
||||
create table t1 (a int) type=innodb;
|
||||
create table t2 (a int) type=innodb;
|
||||
create table t3 (a int) type=innodb;
|
||||
--enable_warnings
|
||||
insert into t1 values (1),(2),(3),(4);
|
||||
insert into t2 values (10),(20),(30),(40);
|
||||
insert into t3 values (1),(2),(10),(50);
|
||||
|
Reference in New Issue
Block a user