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

merge

Browse Source 
myisam/mi_check.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged
This commit is contained in:
unknown
2001-01-28 21:41:10 +02:00
parent 184e24b225 12fd55a5a6
commit 0374dcdd95
33 changed files with 375 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/r/rpl000018.result Normal file
View File

@ -0,0 +1,5 @@
Log_name
master-bin.001
master-bin.002
n
3351

6
mysql-test/r/status.result Normal file
View File

@ -0,0 +1,6 @@
Variable_name Value
Table_locks_immediate 0
Table_locks_waited 0
Variable_name Value
Table_locks_immediate 3
Table_locks_waited 1

BIN
mysql-test/std_data/master-bin.001 Normal file
View File

Binary file not shown.

4
mysql-test/t/overflow.test Normal file
View File

@ -0,0 +1,4 @@
connect (con1,localhost,boo,,test,0,mysql-master.sock);
connection con1;
-- error 1064;
drop database AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA;

1
mysql-test/t/rpl000018-master.opt Normal file
View File

@ -0,0 +1 @@
-O max_binlog_size=4096

3
mysql-test/t/rpl000018-master.sh Executable file
View File

@ -0,0 +1,3 @@
rm -f $MYSQL_TEST_DIR/var/lib/master-bin.*
cp $MYSQL_TEST_DIR/std_data/master-bin.001 $MYSQL_TEST_DIR/var/lib/
echo ./master-bin.001 > $MYSQL_TEST_DIR/var/lib/master-bin.index

1
mysql-test/t/rpl000018-slave.opt Normal file
View File

@ -0,0 +1 @@
--skip-slave-start --abort-slave-event-count=1

19
mysql-test/t/rpl000018.test Normal file
View File

@ -0,0 +1,19 @@
connect (master,localhost,root,,test,0,mysql-master.sock);
connect (slave,localhost,root,,test,0,mysql-slave.sock);
connection slave;
reset slave;
slave start;
connection master;
show master logs;
drop table if exists t1;
create table t1(n int);
insert into t1 values (3351);
save_master_pos;
connection slave;
sync_with_master;
select * from t1;
connection master;
drop table t1;
save_master_pos;
connection slave;
sync_with_master;

23
mysql-test/t/status.test Normal file
View File

@ -0,0 +1,23 @@
connect (con1,localhost,root,,test,0,mysql-master.sock);
connect (con2,localhost,root,,test,0,mysql-master.sock);
flush status;
show status like 'Table_lock%';
connection con1;
SET SQL_LOG_BIN=0;
drop table if exists t1;
create table t1(n int);
insert into t1 values(1);
connection con2;
lock tables t1 read;
unlock tables;
lock tables t1 read;
connection con1;
send update t1 set n = 3;
connection con2;
sleep 0.5;
unlock tables;
connection con1;
reap;
show status like 'Table_lock%';
drop table t1;