diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-12-20 15:46:36 -0700 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-12-20 15:46:36 -0700 |
| commit | 9639b35ab514bb03d4f39f0924998752bbe948a2 (patch) | |
| tree | 878691cbdebcb4f4b99aac2feed2af315483ee93 /mysql-test/include | |
| parent | 7ae6af4e00acadb3c16a22dcd555045de04b9fca (diff) | |
| parent | b8550ca15a961b522c3197afb465b8998a966722 (diff) | |
| download | mariadb-git-9639b35ab514bb03d4f39f0924998752bbe948a2.tar.gz | |
Merge siva.hindu.god:/usr/home/tim/m/bk/50-build
into siva.hindu.god:/usr/home/tim/m/bk/51-build
cmd-line-utils/readline/histfile.c:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/udf_example.c:
Auto merged
storage/innobase/include/row0mysql.h:
Auto merged
strings/decimal.c:
Auto merged
mysql-test/include/mix1.inc:
Manual merge
mysql-test/r/func_str.result:
Manual merge
mysql-test/r/innodb_mysql.result:
Manual merge
mysql-test/t/disabled.def:
Manual merge
mysql-test/t/func_str.test:
Manual merge
sql/mysqld.cc:
Manual merge
storage/innobase/handler/ha_innodb.cc:
Manual merge
storage/innobase/handler/ha_innodb.h:
Manual merge
storage/innobase/row/row0mysql.c:
Manual merge
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/innodb_rollback_on_timeout.inc | 37 | ||||
| -rw-r--r-- | mysql-test/include/mix1.inc | 2 |
2 files changed, 39 insertions, 0 deletions
diff --git a/mysql-test/include/innodb_rollback_on_timeout.inc b/mysql-test/include/innodb_rollback_on_timeout.inc new file mode 100644 index 00000000000..73c7374c79e --- /dev/null +++ b/mysql-test/include/innodb_rollback_on_timeout.inc @@ -0,0 +1,37 @@ +# +# Bug #24200: Provide backwards compatibility mode for 4.x "rollback on +# transaction timeout" +# +show variables like 'innodb_rollback_on_timeout'; +create table t1 (a int unsigned not null primary key) engine = innodb; +insert into t1 values (1); +commit; +connect (con1,localhost,root,,); +connect (con2,localhost,root,,); + +connection con2; +begin work; +insert into t1 values (2); +select * from t1; + +connection con1; +begin work; +insert into t1 values (5); +select * from t1; +# Lock wait timeout set to 2 seconds in <THIS TEST>-master.opt; this +# statement will time out; in 5.0.13+, it will not roll back transaction. +--error ER_LOCK_WAIT_TIMEOUT +insert into t1 values (2); +# On 5.0.13+, this should give ==> 1, 5 +select * from t1; +commit; + +connection con2; +select * from t1; +commit; + +connection default; +select * from t1; +drop table t1; +disconnect con1; +disconnect con2; diff --git a/mysql-test/include/mix1.inc b/mysql-test/include/mix1.inc index 7fe369cfb1e..9619db2203c 100644 --- a/mysql-test/include/mix1.inc +++ b/mysql-test/include/mix1.inc @@ -462,6 +462,8 @@ EXPLAIN SELECT b, SUM(c) FROM t1 GROUP BY b; EXPLAIN SELECT SQL_BIG_RESULT b, SUM(c) FROM t1 GROUP BY b; DROP TABLE t1; +--source include/innodb_rollback_on_timeout.inc + --echo End of 5.0 tests |