Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
dc98e6eb
Commit
dc98e6eb
authored
Jan 13, 2015
by
Rich Prohaska
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into releases/tokudb-7.5
parents
1c0cda22
ba000b3d
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1 addition
and
40 deletions
+1
-40
doc/sysbench.update.ma10.tokudb754.loglog.png
doc/sysbench.update.ma10.tokudb754.loglog.png
+0
-0
doc/sysbench.update.ma10.tokudb754.png
doc/sysbench.update.ma10.tokudb754.png
+0
-0
mysql-test/suite/tokudb.bugs/r/memcache_dirty.result
mysql-test/suite/tokudb.bugs/r/memcache_dirty.result
+0
-14
mysql-test/suite/tokudb.bugs/t/memcache_dirty.test
mysql-test/suite/tokudb.bugs/t/memcache_dirty.test
+0
-25
storage/tokudb/hatoku_defines.h
storage/tokudb/hatoku_defines.h
+1
-1
No files found.
doc/sysbench.update.ma10.tokudb754.loglog.png
View replaced file @
1c0cda22
View file @
dc98e6eb
6.78 KB
|
W:
|
H:
7.04 KB
|
W:
|
H:
2-up
Swipe
Onion skin
doc/sysbench.update.ma10.tokudb754.png
View replaced file @
1c0cda22
View file @
dc98e6eb
7.18 KB
|
W:
|
H:
7.35 KB
|
W:
|
H:
2-up
Swipe
Onion skin
mysql-test/suite/tokudb.bugs/r/memcache_dirty.result
deleted
100644 → 0
View file @
1c0cda22
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;
mysql-test/suite/tokudb.bugs/t/memcache_dirty.test
deleted
100644 → 0
View file @
1c0cda22
--
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
;
storage/tokudb/hatoku_defines.h
View file @
dc98e6eb
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment