From 634a08c5283d1db7883b2c1c224f17fcf48ad6d8 Mon Sep 17 00:00:00 2001 From: Rich Prohaska Date: Tue, 18 Dec 2012 13:18:42 +0000 Subject: [PATCH] refs #4476 port fast update tests to 5.6 git-svn-id: file:///svn/mysql/tests/mysql-test@51339 c7de825b-a66e-492c-adef-691d508d4ae1 --- .../suite/tokudb.fast_update/r/tokudb_binlog_mixed.result | 1 + mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_row.result | 1 + .../suite/tokudb.fast_update/r/tokudb_binlog_statement.result | 1 + .../suite/tokudb.fast_update/r/tokudb_update_deadlock.result | 1 + .../suite/tokudb.fast_update/r/tokudb_upsert_deadlock.result | 1 + mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_mixed.test | 1 + mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_row.test | 1 + .../suite/tokudb.fast_update/t/tokudb_binlog_statement.test | 1 + .../suite/tokudb.fast_update/t/tokudb_update_deadlock.test | 2 ++ .../suite/tokudb.fast_update/t/tokudb_upsert_deadlock.test | 2 ++ 10 files changed, 12 insertions(+) diff --git a/mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_mixed.result b/mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_mixed.result index 10ac5e5d2b4..fd9a25aacbc 100644 --- a/mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_mixed.result +++ b/mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_mixed.result @@ -1,3 +1,4 @@ +set default_storage_engine='tokudb'; create table tt (id int primary key, x int); set session tokudb_enable_fast_upsert=1; set session tokudb_disable_slow_upsert=1; diff --git a/mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_row.result b/mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_row.result index 10ac5e5d2b4..fd9a25aacbc 100644 --- a/mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_row.result +++ b/mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_row.result @@ -1,3 +1,4 @@ +set default_storage_engine='tokudb'; create table tt (id int primary key, x int); set session tokudb_enable_fast_upsert=1; set session tokudb_disable_slow_upsert=1; diff --git a/mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_statement.result b/mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_statement.result index 10ac5e5d2b4..fd9a25aacbc 100644 --- a/mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_statement.result +++ b/mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_statement.result @@ -1,3 +1,4 @@ +set default_storage_engine='tokudb'; create table tt (id int primary key, x int); set session tokudb_enable_fast_upsert=1; set session tokudb_disable_slow_upsert=1; diff --git a/mysql-test/suite/tokudb.fast_update/r/tokudb_update_deadlock.result b/mysql-test/suite/tokudb.fast_update/r/tokudb_update_deadlock.result index 1a5c8cd1235..3eec02e6558 100644 --- a/mysql-test/suite/tokudb.fast_update/r/tokudb_update_deadlock.result +++ b/mysql-test/suite/tokudb.fast_update/r/tokudb_update_deadlock.result @@ -1,4 +1,5 @@ drop table if exists t; +set default_storage_engine='tokudb'; create table t (id bigint primary key, b bigint not null default 0); insert into t (id) values (1),(2); set session tokudb_enable_fast_update=1; diff --git a/mysql-test/suite/tokudb.fast_update/r/tokudb_upsert_deadlock.result b/mysql-test/suite/tokudb.fast_update/r/tokudb_upsert_deadlock.result index ef27a368268..8ee74264fff 100644 --- a/mysql-test/suite/tokudb.fast_update/r/tokudb_upsert_deadlock.result +++ b/mysql-test/suite/tokudb.fast_update/r/tokudb_upsert_deadlock.result @@ -1,4 +1,5 @@ drop table if exists t; +set default_storage_engine='tokudb'; create table t (id bigint primary key, b bigint not null default 0); set session tokudb_enable_fast_upsert=1; begin; diff --git a/mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_mixed.test b/mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_mixed.test index eeb6f055e6a..adf9c734f2f 100644 --- a/mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_mixed.test +++ b/mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_mixed.test @@ -1,6 +1,7 @@ source include/have_binlog_format_mixed.inc; source include/have_tokudb.inc; +set default_storage_engine='tokudb'; create table tt (id int primary key, x int); set session tokudb_enable_fast_upsert=1; diff --git a/mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_row.test b/mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_row.test index f7aed08fb0c..fd466c2818b 100644 --- a/mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_row.test +++ b/mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_row.test @@ -1,6 +1,7 @@ source include/have_binlog_format_row.inc; source include/have_tokudb.inc; +set default_storage_engine='tokudb'; create table tt (id int primary key, x int); set session tokudb_enable_fast_upsert=1; diff --git a/mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_statement.test b/mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_statement.test index dd761f5835f..721f77f6c2e 100644 --- a/mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_statement.test +++ b/mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_statement.test @@ -1,6 +1,7 @@ source include/have_binlog_format_statement.inc; source include/have_tokudb.inc; +set default_storage_engine='tokudb'; create table tt (id int primary key, x int); set session tokudb_enable_fast_upsert=1; diff --git a/mysql-test/suite/tokudb.fast_update/t/tokudb_update_deadlock.test b/mysql-test/suite/tokudb.fast_update/t/tokudb_update_deadlock.test index 5b7aacf5fa7..6bc81a4e07a 100644 --- a/mysql-test/suite/tokudb.fast_update/t/tokudb_update_deadlock.test +++ b/mysql-test/suite/tokudb.fast_update/t/tokudb_update_deadlock.test @@ -4,6 +4,8 @@ disable_warnings; drop table if exists t; enable_warnings; +set default_storage_engine='tokudb'; + create table t (id bigint primary key, b bigint not null default 0); insert into t (id) values (1),(2); diff --git a/mysql-test/suite/tokudb.fast_update/t/tokudb_upsert_deadlock.test b/mysql-test/suite/tokudb.fast_update/t/tokudb_upsert_deadlock.test index c005539b81b..9f3ab71d258 100644 --- a/mysql-test/suite/tokudb.fast_update/t/tokudb_upsert_deadlock.test +++ b/mysql-test/suite/tokudb.fast_update/t/tokudb_upsert_deadlock.test @@ -4,6 +4,8 @@ disable_warnings; drop table if exists t; enable_warnings; +set default_storage_engine='tokudb'; + create table t (id bigint primary key, b bigint not null default 0); connect (conn1,localhost,root,,);