diff options
Diffstat (limited to 'storage/tokudb/mysql-test/tokudb/r/fast_upsert_deadlock.result')
| -rw-r--r-- | storage/tokudb/mysql-test/tokudb/r/fast_upsert_deadlock.result | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/storage/tokudb/mysql-test/tokudb/r/fast_upsert_deadlock.result b/storage/tokudb/mysql-test/tokudb/r/fast_upsert_deadlock.result index 192d32d9a95..d7ec18951e1 100644 --- a/storage/tokudb/mysql-test/tokudb/r/fast_upsert_deadlock.result +++ b/storage/tokudb/mysql-test/tokudb/r/fast_upsert_deadlock.result @@ -1,12 +1,17 @@ -drop table if exists t; -set default_storage_engine='tokudb'; -create table t (id bigint primary key, b bigint not null default 0); +set tokudb_enable_fast_upsert=1; +set session sql_mode=(select replace(@@sql_mode,'STRICT_TRANS_TABLES','')); +set session sql_mode=(select replace(@@sql_mode,'STRICT_ALL_TABLES','')); +create table t (id bigint primary key, b bigint not null default 0) +engine = tokudb; +SET SESSION sql_mode=(SELECT REPLACE(@@sql_mode,'STRICT_TRANS_TABLES','')); +SET SESSION sql_mode=(SELECT REPLACE(@@sql_mode,'STRICT_ALL_TABLES','')); +set tokudb_enable_fast_upsert=1; begin; -insert noar into t (id) values (1) on duplicate key update b=b+1; +insert into t (id) values (1) on duplicate key update b=b+1; begin; -insert noar into t (id) values (2) on duplicate key update b=b-1; -insert noar into t (id) values (2) on duplicate key update b=b+1; -insert noar into t (id) values (1) on duplicate key update b=b-1; +insert into t (id) values (2) on duplicate key update b=b-1; +insert into t (id) values (2) on duplicate key update b=b+1; +insert into t (id) values (1) on duplicate key update b=b-1; Got one of the listed errors rollback; commit; |