Commit dc98e6eb authored by Rich Prohaska's avatar Rich Prohaska

Merge branch 'master' into releases/tokudb-7.5

parents 1c0cda22 ba000b3d
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
SET DEFAULT_STORAGE_ENGINE = 'tokudb';
DROP TABLE IF EXISTS t1;
create table t1 (i int, j int, primary key (i))engine=TokuDB;
insert into t1 values (0,0) MEMCACHE_DIRTY 'a';
insert into t1 values (1,0) MEMCACHE_DIRTY 'b', 'c';
update t1 set j=j+1 where i=0 MEMCACHE_DIRTY 'a';
update t1 set j=j+1 where i=1 MEMCACHE_DIRTY 'b', 'c';
insert into t1 values (0,0) on duplicate key update j=j+1 MEMCACHE_DIRTY 'a';
insert into t1 values (2,0) on duplicate key update j=j+1 MEMCACHE_DIRTY 'a', 'b';
replace into t1 values (0,3) MEMCACHE_DIRTY 'a';
replace into t1 values (3,3) MEMCACHE_DIRTY 'a', 'b';
delete from t1 where i=0 MEMCACHE_DIRTY 'a';
delete from t1 where i=1 MEMCACHE_DIRTY 'b', 'c';
DROP TABLE t1;
--source include/have_tokudb.inc
#
# Record inconsistency.
#
#
SET DEFAULT_STORAGE_ENGINE = 'tokudb';
--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings
create table t1 (i int, j int, primary key (i))engine=TokuDB;
insert into t1 values (0,0) MEMCACHE_DIRTY 'a'; insert into t1 values (1,0) MEMCACHE_DIRTY 'b', 'c';
update t1 set j=j+1 where i=0 MEMCACHE_DIRTY 'a'; update t1 set j=j+1 where i=1 MEMCACHE_DIRTY 'b', 'c';
insert into t1 values (0,0) on duplicate key update j=j+1 MEMCACHE_DIRTY 'a'; insert into t1 values (2,0) on duplicate key update j=j+1 MEMCACHE_DIRTY 'a', 'b';
replace into t1 values (0,3) MEMCACHE_DIRTY 'a'; replace into t1 values (3,3) MEMCACHE_DIRTY 'a', 'b';
delete from t1 where i=0 MEMCACHE_DIRTY 'a'; delete from t1 where i=1 MEMCACHE_DIRTY 'b', 'c';
# Final cleanup.
DROP TABLE t1;
......@@ -162,7 +162,7 @@ PATENT RIGHTS GRANT:
#if defined(MARIADB_BASE_VERSION)
#define TOKU_INCLUDE_EXTENDED_KEYS 1
#endif
#define TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL 1
#define TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL 0
#else
#error
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment