database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Auto-merge from mysql-next-mr.

Browse Source
This commit is contained in:
Alexander Nozdrin
2010-02-20 12:40:21 +03:00
parent 5b1700bbfa 7ba0546620
commit 77c6baf612
288 changed files with 305780 additions and 33881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mysql-test/suite/binlog/r/binlog_row_drop_tbl.result Normal file
View File

@@ -0,0 +1,16 @@
DROP TABLE IF EXISTS t1;
RESET MASTER;
CREATE TABLE t1 (a INT);
SET AUTOCOMMIT=OFF;
BEGIN;
INSERT INTO t1 VALUES(1);
DROP TABLE t1;;
COMMIT;
show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT)
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT
master-bin.000001 # Query # # use `test`; DROP TABLE t1

1
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
View File

@@ -241,6 +241,7 @@ select (@after:=unix_timestamp())*0;
select (@after-@before) >= 2;
(@after-@before) >= 2
1
commit;
drop table t1,t2;
commit;
begin;

15
mysql-test/suite/binlog/r/binlog_stm_drop_tbl.result Normal file
View File

@@ -0,0 +1,15 @@
DROP TABLE IF EXISTS t1;
RESET MASTER;
CREATE TABLE t1 (a INT);
SET AUTOCOMMIT=OFF;
BEGIN;
INSERT INTO t1 VALUES(1);
DROP TABLE t1;;
COMMIT;
show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT)
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES(1)
master-bin.000001 # Query # # COMMIT
master-bin.000001 # Query # # use `test`; DROP TABLE t1

1
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
View File

@@ -229,6 +229,7 @@ select (@after:=unix_timestamp())*0;
select (@after-@before) >= 2;
(@after-@before) >= 2
1
commit;
drop table t1,t2;
commit;
begin;

5
mysql-test/suite/binlog/t/binlog_row_drop_tbl.test Normal file
View File

@@ -0,0 +1,5 @@
# This is a wrapper for drop_table.test so that the same test case can be used
# For both statement and row based bin logs
-- source include/have_binlog_format_row.inc
-- source extra/binlog_tests/drop_table.test

5
mysql-test/suite/binlog/t/binlog_stm_drop_tbl.test Normal file
View File

@@ -0,0 +1,5 @@
# This is a wrapper for drop_table.test so that the same test case can be used
# For both statement and row based bin logs
-- source include/have_binlog_format_mixed_or_statement.inc
-- source extra/binlog_tests/drop_table.test

2
mysql-test/suite/binlog/t/binlog_stm_row.test
View File

@@ -60,7 +60,7 @@ let $wait_condition=
--echo # con1
let $wait_condition=
SELECT COUNT(*) = 1 FROM information_schema.processlist WHERE
state = "Locked" and info = "INSERT INTO t2 VALUES (3)";
state = "Table lock" and info = "INSERT INTO t2 VALUES (3)";
--source include/wait_condition.inc
SELECT RELEASE_LOCK('Bug#34306');
--connection con2