diff options
| author | unknown <konstantin@mysql.com> | 2006-02-02 18:17:18 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-02-02 18:17:18 +0300 |
| commit | 95a3509a6637699fdcc26d7042013778c5e55d08 (patch) | |
| tree | 336ed0f3ebd53f06d2b14904f4fd937b5fe487c6 /mysql-test/r/kill.result | |
| parent | 9b3e6c27b0615270042cff92c88cb338ded9b69f (diff) | |
| parent | 1e686ae7702d297cc9fd261c42864653f4fdd7b3 (diff) | |
| download | mariadb-git-95a3509a6637699fdcc26d7042013778c5e55d08.tar.gz | |
Merge mysql.com:/opt/local/work/mysql-4.1-root
into mysql.com:/opt/local/work/mysql-5.0-root
BitKeeper/deleted/.del-rpl_ignore_table.result:
Delete: mysql-test/r/rpl_ignore_table.result
BitKeeper/deleted/.del-rpl_multi_update4.result:
Delete: mysql-test/r/rpl_multi_update4.result
BitKeeper/deleted/.del-rpl_ignore_table-slave.opt:
Delete: mysql-test/t/rpl_ignore_table-slave.opt
BitKeeper/deleted/.del-rpl_ignore_table.test:
Delete: mysql-test/t/rpl_ignore_table.test
BitKeeper/deleted/.del-rpl_multi_update4-slave.opt:
Delete: mysql-test/t/rpl_multi_update4-slave.opt
BitKeeper/deleted/.del-disabled.def:
Auto merged
BitKeeper/deleted/.del-rpl_multi_update4.test:
Delete: mysql-test/t/rpl_multi_update4.test
heap/hp_create.c:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/update.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
mysql-test/t/heap.test:
Auto merged
mysql-test/t/kill.test:
Auto merged
mysql-test/t/update.test:
Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
ndb/test/ndbapi/testBlobs.cpp:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
configure.in:
Manual merge.
libmysql/libmysql.c:
Manual merge.
mysql-test/r/heap.result:
Manual merge.
mysql-test/r/heap_hash.result:
Manual merge.
mysql-test/r/kill.result:
Manual merge.
sql/ha_heap.cc:
Manual merge.
sql/ha_heap.h:
Manual merge.
sql/item_timefunc.cc:
Manual merge.
sql/sql_class.cc:
Manual merge.
sql/sql_parse.cc:
Manual merge.
sql/sql_update.cc:
Manual merge.
tests/mysql_client_test.c:
Manual merge.
Diffstat (limited to 'mysql-test/r/kill.result')
| -rw-r--r-- | mysql-test/r/kill.result | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/mysql-test/r/kill.result b/mysql-test/r/kill.result index 2413834be4f..d52d2eb9ebb 100644 --- a/mysql-test/r/kill.result +++ b/mysql-test/r/kill.result @@ -1,4 +1,4 @@ -drop table if exists t1; +drop table if exists t1, t2, t3; create table t1 (kill_id int); insert into t1 values(connection_id()); select ((@id := kill_id) - kill_id) from t1; @@ -27,3 +27,15 @@ select 1; select RELEASE_LOCK("a"); RELEASE_LOCK("a") 1 +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; +ERROR 08S01: Server shutdown in progress +drop table t1, t2, t3; |