mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
Update paths
Add missing drop view
This commit is contained in:
parent
7186bc018b
commit
ae9f0285c0
5 changed files with 9 additions and 6 deletions
|
@ -317,17 +317,18 @@ connection con4;
|
||||||
select get_lock("a",10); # wait for rollback to finish
|
select get_lock("a",10); # wait for rollback to finish
|
||||||
flush logs;
|
flush logs;
|
||||||
|
|
||||||
|
let $MYSQLD_DATADIR= `select @@datadir`;
|
||||||
# we check that the error code of the "ROLLBACK" event is 0 and not
|
# we check that the error code of the "ROLLBACK" event is 0 and not
|
||||||
# ER_SERVER_SHUTDOWN (i.e. disconnection just rolls back transaction
|
# ER_SERVER_SHUTDOWN (i.e. disconnection just rolls back transaction
|
||||||
# and does not make slave to stop)
|
# and does not make slave to stop)
|
||||||
if (`select @@binlog_format = 'ROW'`)
|
if (`select @@binlog_format = 'ROW'`)
|
||||||
{
|
{
|
||||||
--exec $MYSQL_BINLOG --start-position=524 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output
|
--exec $MYSQL_BINLOG --start-position=524 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output
|
||||||
}
|
}
|
||||||
|
|
||||||
if (`select @@binlog_format = 'STATEMENT' || @@binlog_format = 'MIXED'`)
|
if (`select @@binlog_format = 'STATEMENT' || @@binlog_format = 'MIXED'`)
|
||||||
{
|
{
|
||||||
--exec $MYSQL_BINLOG --start-position=555 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output
|
--exec $MYSQL_BINLOG --start-position=555 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output
|
||||||
}
|
}
|
||||||
|
|
||||||
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
|
@ -618,7 +619,7 @@ CREATE TABLE t5 (a int, PRIMARY KEY (a)) ENGINE=InnoDB;
|
||||||
|
|
||||||
# execute
|
# execute
|
||||||
--error ER_DUP_ENTRY
|
--error ER_DUP_ENTRY
|
||||||
load data infile '../std_data_ln/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2);
|
load data infile '../../std_data/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2);
|
||||||
# check
|
# check
|
||||||
select * from t4;
|
select * from t4;
|
||||||
select count(*) from t1 /* must be 2 */;
|
select count(*) from t1 /* must be 2 */;
|
||||||
|
|
|
@ -653,7 +653,7 @@ delete from t1;
|
||||||
create table t4 (a int default 0, b int primary key) engine=innodb;
|
create table t4 (a int default 0, b int primary key) engine=innodb;
|
||||||
insert into t4 values (0, 17);
|
insert into t4 values (0, 17);
|
||||||
reset master;
|
reset master;
|
||||||
load data infile '../std_data_ln/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2);
|
load data infile '../../std_data/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2);
|
||||||
ERROR 23000: Duplicate entry '17' for key 'PRIMARY'
|
ERROR 23000: Duplicate entry '17' for key 'PRIMARY'
|
||||||
select * from t4;
|
select * from t4;
|
||||||
a b
|
a b
|
||||||
|
|
|
@ -611,7 +611,7 @@ delete from t1;
|
||||||
create table t4 (a int default 0, b int primary key) engine=innodb;
|
create table t4 (a int default 0, b int primary key) engine=innodb;
|
||||||
insert into t4 values (0, 17);
|
insert into t4 values (0, 17);
|
||||||
reset master;
|
reset master;
|
||||||
load data infile '../std_data_ln/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2);
|
load data infile '../../std_data/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2);
|
||||||
ERROR 23000: Duplicate entry '17' for key 'PRIMARY'
|
ERROR 23000: Duplicate entry '17' for key 'PRIMARY'
|
||||||
select * from t4;
|
select * from t4;
|
||||||
a b
|
a b
|
||||||
|
@ -625,7 +625,7 @@ master-bin.000001 # Query # # use `test`; BEGIN
|
||||||
master-bin.000001 # Intvar # # INSERT_ID=10
|
master-bin.000001 # Intvar # # INSERT_ID=10
|
||||||
master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=12
|
master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=12
|
||||||
master-bin.000001 # Intvar # # INSERT_ID=10
|
master-bin.000001 # Intvar # # INSERT_ID=10
|
||||||
master-bin.000001 # Execute_load_query # # use `test`; load data infile '../std_data_ln/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2) ;file_id=#
|
master-bin.000001 # Execute_load_query # # use `test`; load data infile '../../std_data/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2) ;file_id=#
|
||||||
master-bin.000001 # Query # # use `test`; ROLLBACK
|
master-bin.000001 # Query # # use `test`; ROLLBACK
|
||||||
/* the output must denote there is the query */;
|
/* the output must denote there is the query */;
|
||||||
drop trigger trg_del_t2;
|
drop trigger trg_del_t2;
|
||||||
|
|
|
@ -11,3 +11,4 @@ Level Warning
|
||||||
Code 1592
|
Code 1592
|
||||||
Message Statement is not safe to log in statement format.
|
Message Statement is not safe to log in statement format.
|
||||||
DROP TABLE t1,t2,t3;
|
DROP TABLE t1,t2,t3;
|
||||||
|
DROP VIEW v1;
|
||||||
|
|
|
@ -14,5 +14,6 @@ INSERT INTO t1 SELECT UUID();
|
||||||
query_vertical SHOW WARNINGS;
|
query_vertical SHOW WARNINGS;
|
||||||
|
|
||||||
DROP TABLE t1,t2,t3;
|
DROP TABLE t1,t2,t3;
|
||||||
|
DROP VIEW v1;
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue