database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bk-internal:/home/bk/mysql-5.0

Browse Source 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/handler.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
This commit is contained in:
unknown
2005-04-12 17:22:14 +02:00
parent 3767fb0118 859b3e16ac
commit b59dc1e860
5 changed files with 64 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mysql-test/r/flush_block_commit.result
View File

@ -37,3 +37,18 @@ show create database test;
Database Create Database
test CREATE DATABASE `test` /*!40100 DEFAULT CHARACTER SET latin1 */
drop table t1;
create table t1 (a int) engine=innodb;
reset master;
set autocommit=0;
insert t1 values (1);
flush tables with read lock;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 98
commit;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 276
unlock tables;
drop table t1;
set autocommit=1;

21
mysql-test/t/flush_block_commit.test
View File

@ -76,3 +76,24 @@ select * from t1;
show create database test;
drop table t1;
# FLUSH TABLES WITH READ LOCK should block writes to binlog too
connection con1;
create table t1 (a int) engine=innodb;
reset master;
set autocommit=0;
insert t1 values (1);
connection con2;
flush tables with read lock;
show master status;
connection con1;
send commit;
connection con2;
sleep 1;
show master status;
unlock tables;
connection con1;
reap;
drop table t1;
set autocommit=1;