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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
1af29d27
Commit
1af29d27
authored
Aug 25, 2013
by
Rich Prohaska
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tokutek/mysql56#2 get tokudb storage engine to build on mysql 5.6
parent
d46b4cfc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
storage/tokudb/hatoku_defines.h
storage/tokudb/hatoku_defines.h
+1
-1
storage/tokudb/hatoku_hton.cc
storage/tokudb/hatoku_hton.cc
+6
-0
No files found.
storage/tokudb/hatoku_defines.h
View file @
1af29d27
...
@@ -150,7 +150,7 @@ PATENT RIGHTS GRANT:
...
@@ -150,7 +150,7 @@ PATENT RIGHTS GRANT:
#define TOKU_INCLUDE_EXTENDED_KEYS 1
#define TOKU_INCLUDE_EXTENDED_KEYS 1
#endif
#endif
#define TOKU_INCLUDE_OTHER_DB_TYPE 1
#define TOKU_INCLUDE_OTHER_DB_TYPE 1
#define TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL 1
#else
#else
#error
#error
...
...
storage/tokudb/hatoku_hton.cc
View file @
1af29d27
...
@@ -316,7 +316,9 @@ static void tokudb_cleanup_log_files(void);
...
@@ -316,7 +316,9 @@ static void tokudb_cleanup_log_files(void);
static
int
tokudb_end
(
handlerton
*
hton
,
ha_panic_function
type
);
static
int
tokudb_end
(
handlerton
*
hton
,
ha_panic_function
type
);
static
bool
tokudb_flush_logs
(
handlerton
*
hton
);
static
bool
tokudb_flush_logs
(
handlerton
*
hton
);
static
bool
tokudb_show_status
(
handlerton
*
hton
,
THD
*
thd
,
stat_print_fn
*
print
,
enum
ha_stat_type
);
static
bool
tokudb_show_status
(
handlerton
*
hton
,
THD
*
thd
,
stat_print_fn
*
print
,
enum
ha_stat_type
);
#if TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL
static
void
tokudb_handle_fatal_signal
(
handlerton
*
hton
,
THD
*
thd
,
int
sig
);
static
void
tokudb_handle_fatal_signal
(
handlerton
*
hton
,
THD
*
thd
,
int
sig
);
#endif
static
int
tokudb_close_connection
(
handlerton
*
hton
,
THD
*
thd
);
static
int
tokudb_close_connection
(
handlerton
*
hton
,
THD
*
thd
);
static
int
tokudb_commit
(
handlerton
*
hton
,
THD
*
thd
,
bool
all
);
static
int
tokudb_commit
(
handlerton
*
hton
,
THD
*
thd
,
bool
all
);
static
int
tokudb_rollback
(
handlerton
*
hton
,
THD
*
thd
,
bool
all
);
static
int
tokudb_rollback
(
handlerton
*
hton
,
THD
*
thd
,
bool
all
);
...
@@ -497,7 +499,9 @@ static int tokudb_init_func(void *p) {
...
@@ -497,7 +499,9 @@ static int tokudb_init_func(void *p) {
tokudb_hton
->
panic
=
tokudb_end
;
tokudb_hton
->
panic
=
tokudb_end
;
tokudb_hton
->
flush_logs
=
tokudb_flush_logs
;
tokudb_hton
->
flush_logs
=
tokudb_flush_logs
;
tokudb_hton
->
show_status
=
tokudb_show_status
;
tokudb_hton
->
show_status
=
tokudb_show_status
;
#if TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL
tokudb_hton
->
handle_fatal_signal
=
tokudb_handle_fatal_signal
;
tokudb_hton
->
handle_fatal_signal
=
tokudb_handle_fatal_signal
;
#endif
if
(
!
tokudb_home
)
if
(
!
tokudb_home
)
tokudb_home
=
mysql_real_data_home
;
tokudb_home
=
mysql_real_data_home
;
DBUG_PRINT
(
"info"
,
(
"tokudb_home: %s"
,
tokudb_home
));
DBUG_PRINT
(
"info"
,
(
"tokudb_home: %s"
,
tokudb_home
));
...
@@ -1860,6 +1864,7 @@ static bool tokudb_show_status(handlerton * hton, THD * thd, stat_print_fn * sta
...
@@ -1860,6 +1864,7 @@ static bool tokudb_show_status(handlerton * hton, THD * thd, stat_print_fn * sta
return
false
;
return
false
;
}
}
#if TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL
static
void
tokudb_handle_fatal_signal
(
handlerton
*
hton
__attribute__
((
__unused__
)),
static
void
tokudb_handle_fatal_signal
(
handlerton
*
hton
__attribute__
((
__unused__
)),
THD
*
thd
__attribute__
((
__unused__
)),
THD
*
thd
__attribute__
((
__unused__
)),
int
sig
)
{
int
sig
)
{
...
@@ -1867,6 +1872,7 @@ static void tokudb_handle_fatal_signal(handlerton *hton __attribute__ ((__unused
...
@@ -1867,6 +1872,7 @@ static void tokudb_handle_fatal_signal(handlerton *hton __attribute__ ((__unused
db_env_try_gdb_stack_trace
(
tokudb_gdb_path
);
db_env_try_gdb_stack_trace
(
tokudb_gdb_path
);
}
}
}
}
#endif
static
void
tokudb_print_error
(
const
DB_ENV
*
db_env
,
const
char
*
db_errpfx
,
const
char
*
buffer
)
{
static
void
tokudb_print_error
(
const
DB_ENV
*
db_env
,
const
char
*
db_errpfx
,
const
char
*
buffer
)
{
sql_print_error
(
"%s: %s"
,
db_errpfx
,
buffer
);
sql_print_error
(
"%s: %s"
,
db_errpfx
,
buffer
);
...
...
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