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

Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0

This commit is contained in:
monty@narttu.mysql.fi
2003-03-04 12:32:28 +02:00
11 changed files with 144 additions and 15 deletions

View File

@ -349,7 +349,8 @@ while test $# -gt 0; do
--debug=d:t:i:A,$MYSQL_TEST_DIR/var/log/master.trace"
EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT \
--debug=d:t:i:A,$MYSQL_TEST_DIR/var/log/slave.trace"
EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT --debug"
EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT \
--debug=d:t:A,$MYSQL_TEST_DIR/var/log/mysqltest.trace"
;;
--fast)
FAST_START=1

View File

@ -1,4 +1,4 @@
drop table if exists t1;
drop table if exists t1,t2;
create table t1(n int);
insert into t1 values (1);
lock tables t1 write;
@ -17,3 +17,10 @@ unlock tables;
n
1
drop table t1;
create table t1 (a int);
create table t2 (a int);
lock table t1 write, t2 write;
insert t1 select * from t2;
drop table t2;
Table 'test.t2' doesn't exist
drop table t1;

View File

@ -6,8 +6,9 @@
#
-- source include/not_embedded.inc
drop table if exists t1;
#test to see if select will get the lock ahead of low priority update
drop table if exists t1,t2;
# test to see if select will get the lock ahead of low priority update
connect (locker,localhost,root,,);
connect (reader,localhost,root,,);
@ -48,3 +49,22 @@ reap;
connection reader;
reap;
drop table t1;
#
# Test problem when using locks on many tables and droping a table that
# is to-be-locked by another thread
#
connection locker;
create table t1 (a int);
create table t2 (a int);
lock table t1 write, t2 write;
connection reader;
send insert t1 select * from t2;
connection locker;
drop table t2;
connection reader;
--error 1146
reap;
connection locker;
drop table t1;