Update tests and result files after running with new mysqltest that better detects problems with test files
This commit is contained in:
parent
5cb71d48d2
commit
f39ff057d1
@ -4913,8 +4913,7 @@ bonfire
|
|||||||
Colombo
|
Colombo
|
||||||
nondecreasing
|
nondecreasing
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
ALTER TABLE t2 RENAME t1
|
ALTER TABLE t2 RENAME t1;
|
||||||
#;
|
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
CREATE TABLE t1 (
|
CREATE TABLE t1 (
|
||||||
Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL,
|
Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL,
|
||||||
|
@ -77,9 +77,9 @@ drop table if exists t1;
|
|||||||
create table t1 (i int);
|
create table t1 (i int);
|
||||||
lock tables t1 read;
|
lock tables t1 read;
|
||||||
create database mysqltest;
|
create database mysqltest;
|
||||||
drop table t1;
|
drop table t1;
|
||||||
show open tables;
|
show open tables;
|
||||||
drop database mysqltest;
|
drop database mysqltest;
|
||||||
select 1;
|
select 1;
|
||||||
1
|
1
|
||||||
1
|
1
|
||||||
|
@ -51,7 +51,7 @@ drop table t1, t2, t3;
|
|||||||
create table t1 (c1 int);
|
create table t1 (c1 int);
|
||||||
create table t2 (c1 int);
|
create table t2 (c1 int);
|
||||||
lock table t1 write;
|
lock table t1 write;
|
||||||
flush tables with read lock;
|
flush tables with read lock;
|
||||||
insert into t2 values(1);
|
insert into t2 values(1);
|
||||||
unlock tables;
|
unlock tables;
|
||||||
drop table t1, t2;
|
drop table t1, t2;
|
||||||
|
@ -45,7 +45,7 @@ flush tables with read lock;
|
|||||||
show master status;
|
show master status;
|
||||||
File Position Binlog_Do_DB Binlog_Ignore_DB
|
File Position Binlog_Do_DB Binlog_Ignore_DB
|
||||||
master-bin.000001 98
|
master-bin.000001 98
|
||||||
commit;
|
commit;
|
||||||
show master status;
|
show master status;
|
||||||
File Position Binlog_Do_DB Binlog_Ignore_DB
|
File Position Binlog_Do_DB Binlog_Ignore_DB
|
||||||
master-bin.000001 98
|
master-bin.000001 98
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
drop table if exists t1;
|
drop table if exists t1;
|
||||||
create table t1 (kill_id int);
|
create table t1 (kill_id int);
|
||||||
insert into t1 values(connection_id());
|
insert into t1 values(connection_id());
|
||||||
flush tables with read lock;
|
flush tables with read lock;
|
||||||
select ((@id := kill_id) - kill_id) from t1;
|
select ((@id := kill_id) - kill_id) from t1;
|
||||||
((@id := kill_id) - kill_id)
|
((@id := kill_id) - kill_id)
|
||||||
0
|
0
|
||||||
|
@ -336,12 +336,12 @@ drop database mysqltest_1;
|
|||||||
set password = password("changed");
|
set password = password("changed");
|
||||||
ERROR 42000: Access denied for user ''@'localhost' to database 'mysql'
|
ERROR 42000: Access denied for user ''@'localhost' to database 'mysql'
|
||||||
lock table mysql.user write;
|
lock table mysql.user write;
|
||||||
flush privileges;
|
flush privileges;
|
||||||
grant all on *.* to 'mysqltest_1'@'localhost';
|
grant all on *.* to 'mysqltest_1'@'localhost';
|
||||||
unlock tables;
|
unlock tables;
|
||||||
lock table mysql.user write;
|
lock table mysql.user write;
|
||||||
set password for 'mysqltest_1'@'localhost' = password('');
|
set password for 'mysqltest_1'@'localhost' = password('');
|
||||||
revoke all on *.* from 'mysqltest_1'@'localhost';
|
revoke all on *.* from 'mysqltest_1'@'localhost';
|
||||||
unlock tables;
|
unlock tables;
|
||||||
drop user 'mysqltest_1'@'localhost';
|
drop user 'mysqltest_1'@'localhost';
|
||||||
create database TESTDB;
|
create database TESTDB;
|
||||||
|
@ -452,7 +452,7 @@ handler t1 read first;
|
|||||||
c1
|
c1
|
||||||
1
|
1
|
||||||
send the below to another connection, do not wait for the result
|
send the below to another connection, do not wait for the result
|
||||||
optimize table t1;
|
optimize table t1;
|
||||||
proceed with the normal connection
|
proceed with the normal connection
|
||||||
handler t1 read next;
|
handler t1 read next;
|
||||||
c1
|
c1
|
||||||
@ -469,7 +469,7 @@ flush tables with read lock;
|
|||||||
drop table t1;
|
drop table t1;
|
||||||
ERROR HY000: Can't execute the query because you have a conflicting read lock
|
ERROR HY000: Can't execute the query because you have a conflicting read lock
|
||||||
send the below to another connection, do not wait for the result
|
send the below to another connection, do not wait for the result
|
||||||
drop table t1;
|
drop table t1;
|
||||||
proceed with the normal connection
|
proceed with the normal connection
|
||||||
select * from t1;
|
select * from t1;
|
||||||
c1
|
c1
|
||||||
|
@ -10,7 +10,7 @@ start transaction;
|
|||||||
select f1();
|
select f1();
|
||||||
f1()
|
f1()
|
||||||
100
|
100
|
||||||
update t1 set col2=0 where col1=1;
|
update t1 set col2=0 where col1=1;
|
||||||
select * from t1;
|
select * from t1;
|
||||||
col1 col2
|
col1 col2
|
||||||
1 100
|
1 100
|
||||||
|
@ -22,7 +22,7 @@ create table t2 (id int unsigned not null);
|
|||||||
insert into t2 select id from t1;
|
insert into t2 select id from t1;
|
||||||
create table t3 (kill_id int);
|
create table t3 (kill_id int);
|
||||||
insert into t3 values(connection_id());
|
insert into t3 values(connection_id());
|
||||||
select id from t1 where id in (select distinct id from t2);
|
select id from t1 where id in (select distinct id from t2);
|
||||||
select ((@id := kill_id) - kill_id) from t3;
|
select ((@id := kill_id) - kill_id) from t3;
|
||||||
((@id := kill_id) - kill_id)
|
((@id := kill_id) - kill_id)
|
||||||
0
|
0
|
||||||
@ -32,7 +32,7 @@ drop table t1, t2, t3;
|
|||||||
select get_lock("a", 10);
|
select get_lock("a", 10);
|
||||||
get_lock("a", 10)
|
get_lock("a", 10)
|
||||||
1
|
1
|
||||||
select get_lock("a", 10);
|
select get_lock("a", 10);
|
||||||
get_lock("a", 10)
|
get_lock("a", 10)
|
||||||
NULL
|
NULL
|
||||||
select 1;
|
select 1;
|
||||||
|
@ -45,7 +45,7 @@ unlock tables;
|
|||||||
drop table t1;
|
drop table t1;
|
||||||
CREATE DATABASE mysqltest_1;
|
CREATE DATABASE mysqltest_1;
|
||||||
FLUSH TABLES WITH READ LOCK;
|
FLUSH TABLES WITH READ LOCK;
|
||||||
DROP DATABASE mysqltest_1;
|
DROP DATABASE mysqltest_1;
|
||||||
DROP DATABASE mysqltest_1;
|
DROP DATABASE mysqltest_1;
|
||||||
ERROR HY000: Can't execute the query because you have a conflicting read lock
|
ERROR HY000: Can't execute the query because you have a conflicting read lock
|
||||||
UNLOCK TABLES;
|
UNLOCK TABLES;
|
||||||
@ -55,7 +55,7 @@ use mysql;
|
|||||||
LOCK TABLES columns_priv WRITE, db WRITE, host WRITE, user WRITE;
|
LOCK TABLES columns_priv WRITE, db WRITE, host WRITE, user WRITE;
|
||||||
FLUSH TABLES;
|
FLUSH TABLES;
|
||||||
use mysql;
|
use mysql;
|
||||||
SELECT user.Select_priv FROM user, db WHERE user.user = db.user LIMIT 1;
|
SELECT user.Select_priv FROM user, db WHERE user.user = db.user LIMIT 1;
|
||||||
OPTIMIZE TABLES columns_priv, db, host, user;
|
OPTIMIZE TABLES columns_priv, db, host, user;
|
||||||
Table Op Msg_type Msg_text
|
Table Op Msg_type Msg_text
|
||||||
mysql.columns_priv optimize status OK
|
mysql.columns_priv optimize status OK
|
||||||
@ -69,14 +69,14 @@ use test;
|
|||||||
use test;
|
use test;
|
||||||
CREATE TABLE t1 (c1 int);
|
CREATE TABLE t1 (c1 int);
|
||||||
LOCK TABLE t1 WRITE;
|
LOCK TABLE t1 WRITE;
|
||||||
FLUSH TABLES WITH READ LOCK;
|
FLUSH TABLES WITH READ LOCK;
|
||||||
CREATE TABLE t2 (c1 int);
|
CREATE TABLE t2 (c1 int);
|
||||||
UNLOCK TABLES;
|
UNLOCK TABLES;
|
||||||
UNLOCK TABLES;
|
UNLOCK TABLES;
|
||||||
DROP TABLE t1, t2;
|
DROP TABLE t1, t2;
|
||||||
CREATE TABLE t1 (c1 int);
|
CREATE TABLE t1 (c1 int);
|
||||||
LOCK TABLE t1 WRITE;
|
LOCK TABLE t1 WRITE;
|
||||||
FLUSH TABLES WITH READ LOCK;
|
FLUSH TABLES WITH READ LOCK;
|
||||||
CREATE TABLE t2 AS SELECT * FROM t1;
|
CREATE TABLE t2 AS SELECT * FROM t1;
|
||||||
ERROR HY000: Table 't2' was not locked with LOCK TABLES
|
ERROR HY000: Table 't2' was not locked with LOCK TABLES
|
||||||
UNLOCK TABLES;
|
UNLOCK TABLES;
|
||||||
@ -84,7 +84,7 @@ UNLOCK TABLES;
|
|||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
create table t1 (f1 int(12) unsigned not null auto_increment, primary key(f1)) engine=innodb;
|
create table t1 (f1 int(12) unsigned not null auto_increment, primary key(f1)) engine=innodb;
|
||||||
lock tables t1 write;
|
lock tables t1 write;
|
||||||
alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; //
|
alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; //
|
||||||
alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; //
|
alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; //
|
||||||
unlock tables;
|
unlock tables;
|
||||||
drop table t1;
|
drop table t1;
|
||||||
|
@ -509,8 +509,8 @@ create table t2 (a int);
|
|||||||
insert into t2 values (10), (20), (30);
|
insert into t2 values (10), (20), (30);
|
||||||
create view v1 as select a as b, a/10 as a from t2;
|
create view v1 as select a as b, a/10 as a from t2;
|
||||||
lock table t1 write;
|
lock table t1 write;
|
||||||
alter table t1 add column c int default 100 after a;
|
alter table t1 add column c int default 100 after a;
|
||||||
update t1, v1 set t1.b=t1.a+t1.b+v1.b where t1.a=v1.a;
|
update t1, v1 set t1.b=t1.a+t1.b+v1.b where t1.a=v1.a;
|
||||||
unlock tables;
|
unlock tables;
|
||||||
select * from t1;
|
select * from t1;
|
||||||
a c b
|
a c b
|
||||||
|
@ -163,7 +163,7 @@ mysqltest: At line 1: Invalid argument to error: '1sssss' - the errno may only c
|
|||||||
mysqltest: At line 1: The sqlstate must be exactly 5 chars long
|
mysqltest: At line 1: The sqlstate must be exactly 5 chars long
|
||||||
mysqltest: At line 1: The sqlstate may only consist of digits[0-9] and _uppercase_ letters
|
mysqltest: At line 1: The sqlstate may only consist of digits[0-9] and _uppercase_ letters
|
||||||
mysqltest: At line 1: The sqlstate must be exactly 5 chars long
|
mysqltest: At line 1: The sqlstate must be exactly 5 chars long
|
||||||
mysqltest: At line 1: Not available in mysqltest for MySQL 4.1.22
|
mysqltest: At line 1: Unknown SQL error name 'E9999'
|
||||||
mysqltest: At line 1: Invalid argument to error: '999e9' - the errno may only consist of digits[0-9]
|
mysqltest: At line 1: Invalid argument to error: '999e9' - the errno may only consist of digits[0-9]
|
||||||
mysqltest: At line 1: Invalid argument to error: '9b' - the errno may only consist of digits[0-9]
|
mysqltest: At line 1: Invalid argument to error: '9b' - the errno may only consist of digits[0-9]
|
||||||
mysqltest: At line 1: Too many errorcodes specified
|
mysqltest: At line 1: Too many errorcodes specified
|
||||||
|
File diff suppressed because one or more lines are too long
@ -326,7 +326,7 @@ insert into t1 values(3);
|
|||||||
set i_var = sleep(3);
|
set i_var = sleep(3);
|
||||||
return 0;
|
return 0;
|
||||||
end;|
|
end;|
|
||||||
select f1();
|
select f1();
|
||||||
select sleep(4);
|
select sleep(4);
|
||||||
sleep(4)
|
sleep(4)
|
||||||
0
|
0
|
||||||
|
@ -31,7 +31,7 @@ create procedure bug9486()
|
|||||||
update t1, t2 set val= 1 where id1=id2;
|
update t1, t2 set val= 1 where id1=id2;
|
||||||
call bug9486();
|
call bug9486();
|
||||||
lock tables t2 write;
|
lock tables t2 write;
|
||||||
call bug9486();
|
call bug9486();
|
||||||
show processlist;
|
show processlist;
|
||||||
Id User Host db Command Time State Info
|
Id User Host db Command Time State Info
|
||||||
# root localhost test Sleep # NULL
|
# root localhost test Sleep # NULL
|
||||||
@ -77,7 +77,7 @@ select * from t1;
|
|||||||
end|
|
end|
|
||||||
use test;
|
use test;
|
||||||
lock table t1 write;
|
lock table t1 write;
|
||||||
call p2();
|
call p2();
|
||||||
use test;
|
use test;
|
||||||
drop procedure p1;
|
drop procedure p1;
|
||||||
create procedure p1() select * from t1;
|
create procedure p1() select * from t1;
|
||||||
|
@ -85,8 +85,7 @@ flush status|
|
|||||||
flush query cache|
|
flush query cache|
|
||||||
delete from t1|
|
delete from t1|
|
||||||
drop procedure bug3583|
|
drop procedure bug3583|
|
||||||
drop table t1;
|
drop table t1|
|
||||||
#|
|
|
||||||
drop procedure if exists bug6807|
|
drop procedure if exists bug6807|
|
||||||
create procedure bug6807()
|
create procedure bug6807()
|
||||||
begin
|
begin
|
||||||
|
@ -26,7 +26,6 @@ t3 CREATE TABLE `t3` (
|
|||||||
`a` mediumtext,
|
`a` mediumtext,
|
||||||
`b` mediumblob
|
`b` mediumblob
|
||||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||||
drop table t1,t2,t3;
|
|
||||||
show create TABLE t4;
|
show create TABLE t4;
|
||||||
Table Create Table
|
Table Create Table
|
||||||
t4 CREATE TABLE `t4` (
|
t4 CREATE TABLE `t4` (
|
||||||
|
@ -1295,7 +1295,7 @@ SELECT fld3 FROM t2;
|
|||||||
#
|
#
|
||||||
|
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
ALTER TABLE t2 RENAME t1
|
ALTER TABLE t2 RENAME t1;
|
||||||
|
|
||||||
#
|
#
|
||||||
# Drop and recreate
|
# Drop and recreate
|
||||||
|
@ -695,7 +695,7 @@ select a from t1;
|
|||||||
flush query cache;
|
flush query cache;
|
||||||
|
|
||||||
drop table t1, t2;
|
drop table t1, t2;
|
||||||
set GLOBAL query_cache_size=1355776
|
set GLOBAL query_cache_size=1355776;
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -2944,11 +2944,11 @@ begin
|
|||||||
show warnings;
|
show warnings;
|
||||||
end|
|
end|
|
||||||
--disable_parsing
|
--disable_parsing
|
||||||
show binlog events;
|
show binlog events|
|
||||||
show storage engines;
|
show storage engines|
|
||||||
show master status;
|
show master status|
|
||||||
show slave hosts;
|
show slave hosts|
|
||||||
show slave status;
|
show slave status|
|
||||||
--enable_parsing
|
--enable_parsing
|
||||||
|
|
||||||
call bug4902()|
|
call bug4902()|
|
||||||
|
@ -19,11 +19,11 @@ begin
|
|||||||
show grants for 'root'@'localhost';
|
show grants for 'root'@'localhost';
|
||||||
end|
|
end|
|
||||||
--disable_parsing
|
--disable_parsing
|
||||||
show binlog events;
|
show binlog events|
|
||||||
show storage engines;
|
show storage engines|
|
||||||
show master status;
|
show master status|
|
||||||
show slave hosts;
|
show slave hosts|
|
||||||
show slave status;
|
show slave status|
|
||||||
--enable_parsing
|
--enable_parsing
|
||||||
|
|
||||||
call bug4902()|
|
call bug4902()|
|
||||||
@ -108,7 +108,7 @@ flush status|
|
|||||||
flush query cache|
|
flush query cache|
|
||||||
delete from t1|
|
delete from t1|
|
||||||
drop procedure bug3583|
|
drop procedure bug3583|
|
||||||
drop table t1;
|
drop table t1|
|
||||||
|
|
||||||
#
|
#
|
||||||
# BUG#6807: Stored procedure crash if CREATE PROCEDURE ... KILL QUERY
|
# BUG#6807: Stored procedure crash if CREATE PROCEDURE ... KILL QUERY
|
||||||
|
@ -26,7 +26,7 @@ grant create view,select on test.* to mysqltest_1@localhost;
|
|||||||
connect (user1,localhost,mysqltest_1,,test);
|
connect (user1,localhost,mysqltest_1,,test);
|
||||||
connection user1;
|
connection user1;
|
||||||
|
|
||||||
-- error ER_SPECIFIC_ACCESS_DENIED
|
-- error ER_SPECIFIC_ACCESS_DENIED_ERROR
|
||||||
create definer=root@localhost view v1 as select * from mysqltest.t1;
|
create definer=root@localhost view v1 as select * from mysqltest.t1;
|
||||||
create view v1 as select * from mysqltest.t1;
|
create view v1 as select * from mysqltest.t1;
|
||||||
# try to modify view without DROP privilege on it
|
# try to modify view without DROP privilege on it
|
||||||
|
Loading…
x
Reference in New Issue
Block a user