mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into releases/tokudb-7.5

Browse source
This commit is contained in:
Rich Prohaska 2015-01-22 07:21:52 -05:00
commit d8493f40ef
2 changed files with 68 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
mysql-test/suite/tokudb.bugs/r/db801.result Normal file
View file

@ -0,0 +1,18 @@
set default_storage_engine=tokudb;
drop table if exists t;
create table t (id int not null primary key, c int not null) engine=tokudb;
insert into t values (1,0);
begin;
update t set c=10 where id=1;
update t set c=100;
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
rollback;
drop table t;
create table t (id int not null primary key, c int not null) engine=tokudb partition by hash(id) partitions 1;
insert into t values (1,0);
begin;
update t set c=10 where id=1;
update t set c=100;
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
rollback;
drop table t;

50
mysql-test/suite/tokudb.bugs/t/db801.test Normal file
View file

@ -0,0 +1,50 @@
# test for the DB-801 bug on mysql-5.5.41
source include/have_tokudb.inc;
source include/have_partition.inc;
set default_storage_engine=tokudb;
disable_warnings;
drop table if exists t;
enable_warnings;
# run the test on a tokudb table
create table t (id int not null primary key, c int not null) engine=tokudb;
insert into t values (1,0);
connect(conn1,localhost,root,,);
connection default;
begin;
update t set c=10 where id=1;
connection conn1;
--error ER_LOCK_WAIT_TIMEOUT
update t set c=100;
connection default;
rollback;
disconnect conn1;
drop table t;
# run the test on a partitioned tokudb table
create table t (id int not null primary key, c int not null) engine=tokudb partition by hash(id) partitions 1;
insert into t values (1,0);
connect(conn1,localhost,root,,);
connection default;
begin;
update t set c=10 where id=1;
connection conn1;
--error ER_LOCK_WAIT_TIMEOUT
update t set c=100;
connection default;
rollback;
disconnect conn1;
drop table t;