database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-11 05:52:26 +03:00
Code Activity

Added test for PTHREAD_YIELD

Browse Source 
Removed test of default master parameter
Don't lock locked tables in REPAIR
Changed optimzation for SELECT * from table,table ORDER BY keypart LIMIT
This commit is contained in:
monty@donna.mysql.fi
2001-04-18 23:47:11 +03:00
parent 5a5e2be98a
commit bc6fd0acaa
14 changed files with 152 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/include/have_default_master.inc
View File

@@ -1,3 +0,0 @@
-- require r/have_default_master.require
connection master;
show variables like "port";

2
mysql-test/r/have_default_master.require
View File

@@ -1,2 +0,0 @@
Variable_name Value
port 9306

4
mysql-test/r/lock.result
View File

@@ -1,2 +1,6 @@
dummy1 count(distinct id)
NULL 1
Table Op Msg_type Msg_text
test.t1 check status OK
Table Op Msg_type Msg_text
test.t2 check error Table 't2' was not locked with LOCK TABLES

32
mysql-test/t/lock.test
View File

@@ -21,3 +21,35 @@ LOCK TABLE t1 WRITE,t2 write;
insert into t2 SELECT * from t1;
update t1 set id=1 where id=-1;
drop table t1,t2;
#
# Check bug with INSERT ... SELECT with lock tables
#
CREATE TABLE t1 (
index1 smallint(6) default NULL,
nr smallint(6) default NULL,
KEY index1(index1)
) TYPE=MyISAM;
CREATE TABLE t2 (
nr smallint(6) default NULL,
name varchar(20) default NULL
) TYPE=MyISAM;
INSERT INTO t2 VALUES (1,'item1');
INSERT INTO t2 VALUES (2,'item2');
# problem begins here!
lock tables t1 write, t2 read;
insert into t1 select 1,nr from t2 where name='item1';
insert into t1 select 2,nr from t2 where name='item2';
unlock tables;
check table t1;
# Check error message
lock tables t1 write;
check table t2;
unlock tables;
drop table t1,t2;

1
mysql-test/t/rpl000014.test
View File

@@ -1,5 +1,4 @@
source include/master-slave.inc;
source include/have_default_master.inc;
connection master;
show master status;
save_master_pos;

1
mysql-test/t/rpl000015.test
View File

@@ -1,6 +1,5 @@
connect (master,localhost,root,,test,0,mysql-master.sock);
connect (slave,localhost,root,,test,0, mysql-slave.sock);
source include/have_default_master.inc;
connection master;
reset master;
show master status;

1
mysql-test/t/rpl000016.test
View File

@@ -1,6 +1,5 @@
connect (master,localhost,root,,test,0,mysql-master.sock);
connect (slave,localhost,root,,test,0,mysql-slave.sock);
source include/have_default_master.inc;
system cat /dev/null > var/slave-data/master.info;
system chmod 000 var/slave-data/master.info;
connection slave;