Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.1


mysql-test/mysql-test-run.sh:
  Auto merged
This commit is contained in:
unknown 2006-03-07 21:27:05 +01:00
commit 6856ffec11
2 changed files with 0 additions and 13 deletions

View File

@ -29,18 +29,6 @@ select ((@id := kill_id) - kill_id) from t3;
kill @id;
Got one of the listed errors
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);
get_lock("a", 10)
1

View File

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