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

after merge

Browse Source
This commit is contained in:
serg@serg.mylan
2006-03-06 23:43:47 +01:00
parent 5a1672dd66
commit 6d6d11787f
3 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/mysql-test-run.sh
View File

@ -19,6 +19,8 @@ TZ=$MY_TZ; export TZ # for UNIX_TIMESTAMP tests to work
LOCAL_SOCKET=@MYSQL_UNIX_ADDR@ LOCAL_SOCKET=@MYSQL_UNIX_ADDR@
MYSQL_TCP_PORT=@MYSQL_TCP_PORT@ MYSQL_TCP_PORT=@MYSQL_TCP_PORT@
umask 022
# For query_cache test # For query_cache test
case `uname` in case `uname` in
SCO_SV | UnixWare | OpenUNIX ) SCO_SV | UnixWare | OpenUNIX )

12
mysql-test/r/kill.result
View File

@ -29,18 +29,6 @@ select ((@id := kill_id) - kill_id) from t3;
kill @id; kill @id;
Got one of the listed errors Got one of the listed errors
drop table t1, t2, t3; drop table t1, t2, t3;
create table t1 (id int primary key);
create table t2 (id int unsigned not null);
insert into t2 select id from t1;
create table t3 (kill_id int);
insert into t3 values(connection_id());
select id from t1 where id in (select distinct id from t2);
select ((@id := kill_id) - kill_id) from t3;
((@id := kill_id) - kill_id)
0
kill @id;
Got one of the listed errors
drop table t1, t2, t3;
select get_lock("a", 10); select get_lock("a", 10);
get_lock("a", 10) get_lock("a", 10)
1 1

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

@ -47,7 +47,6 @@ connection con2;
select 4; select 4;
drop table t1; drop table t1;
connection default; connection default;
disconnect con2;
--error 1064 --error 1064
kill (select count(*) from mysql.user); kill (select count(*) from mysql.user);