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
c11c64e9
Commit
c11c64e9
authored
Mar 24, 2014
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-5822 TokuDB fails to compile without partition storage engine
parent
c18fb72e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
include/my_global.h
include/my_global.h
+6
-0
storage/tokudb/ha_tokudb.cc
storage/tokudb/ha_tokudb.cc
+2
-2
No files found.
include/my_global.h
View file @
c11c64e9
...
@@ -89,6 +89,12 @@
...
@@ -89,6 +89,12 @@
#define IF_WIN(A,B) B
#define IF_WIN(A,B) B
#endif
#endif
#ifdef WITH_PARTITION_STORAGE_ENGINE
#define IF_PARTITIONING(A,B) A
#else
#define IF_PARTITIONING(A,B) B
#endif
#ifndef EMBEDDED_LIBRARY
#ifndef EMBEDDED_LIBRARY
#ifdef WITH_NDB_BINLOG
#ifdef WITH_NDB_BINLOG
#define HAVE_NDB_BINLOG 1
#define HAVE_NDB_BINLOG 1
...
...
storage/tokudb/ha_tokudb.cc
View file @
c11c64e9
...
@@ -1650,7 +1650,7 @@ int ha_tokudb::initialize_share(
...
@@ -1650,7 +1650,7 @@ int ha_tokudb::initialize_share(
goto
exit
;
goto
exit
;
#else
#else
// verify frm data for non-partitioned tables
// verify frm data for non-partitioned tables
if
(
table
->
part_info
==
NULL
)
{
if
(
IF_PARTITIONING
(
table
->
part_info
,
NULL
)
==
NULL
)
{
error
=
verify_frm_data
(
table
->
s
->
path
.
str
,
txn
);
error
=
verify_frm_data
(
table
->
s
->
path
.
str
,
txn
);
if
(
error
)
if
(
error
)
goto
exit
;
goto
exit
;
...
@@ -6934,7 +6934,7 @@ int ha_tokudb::create(const char *name, TABLE * form, HA_CREATE_INFO * create_in
...
@@ -6934,7 +6934,7 @@ int ha_tokudb::create(const char *name, TABLE * form, HA_CREATE_INFO * create_in
if
(
error
)
{
goto
cleanup
;
}
if
(
error
)
{
goto
cleanup
;
}
#else
#else
// only for tables that are not partitioned
// only for tables that are not partitioned
if
(
form
->
part_info
==
NULL
)
{
if
(
IF_PARTITIONING
(
form
->
part_info
,
NULL
)
==
NULL
)
{
error
=
write_frm_data
(
status_block
,
txn
,
form
->
s
->
path
.
str
);
error
=
write_frm_data
(
status_block
,
txn
,
form
->
s
->
path
.
str
);
if
(
error
)
{
goto
cleanup
;
}
if
(
error
)
{
goto
cleanup
;
}
}
}
...
...
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