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
9c47f41e
Commit
9c47f41e
authored
Sep 20, 2013
by
Rich Prohaska
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#81 cleanup thread variables a bit
parent
88ca814b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
17 deletions
+2
-17
storage/tokudb/ha_tokudb_update.cc
storage/tokudb/ha_tokudb_update.cc
+2
-2
storage/tokudb/hatoku_hton.h
storage/tokudb/hatoku_hton.h
+0
-15
No files found.
storage/tokudb/ha_tokudb_update.cc
View file @
9c47f41e
...
@@ -279,7 +279,7 @@ int ha_tokudb::fast_update(THD *thd, List<Item> &update_fields, List<Item> &upda
...
@@ -279,7 +279,7 @@ int ha_tokudb::fast_update(THD *thd, List<Item> &update_fields, List<Item> &upda
check_error:
check_error:
if
(
error
!=
0
)
{
if
(
error
!=
0
)
{
if
(
get_disable_slow_update
(
thd
)
)
if
(
THDVAR
(
thd
,
disable_slow_update
)
!=
0
)
error
=
HA_ERR_UNSUPPORTED
;
error
=
HA_ERR_UNSUPPORTED
;
if
(
error
!=
ENOTSUP
)
if
(
error
!=
ENOTSUP
)
print_error
(
error
,
MYF
(
0
));
print_error
(
error
,
MYF
(
0
));
...
@@ -882,7 +882,7 @@ int ha_tokudb::upsert(THD *thd, List<Item> &update_fields, List<Item> &update_va
...
@@ -882,7 +882,7 @@ int ha_tokudb::upsert(THD *thd, List<Item> &update_fields, List<Item> &update_va
check_error:
check_error:
if
(
error
!=
0
)
{
if
(
error
!=
0
)
{
if
(
get_disable_slow_upsert
(
thd
)
)
if
(
THDVAR
(
thd
,
disable_slow_upsert
)
!=
0
)
error
=
HA_ERR_UNSUPPORTED
;
error
=
HA_ERR_UNSUPPORTED
;
if
(
error
!=
ENOTSUP
)
if
(
error
!=
ENOTSUP
)
print_error
(
error
,
MYF
(
0
));
print_error
(
error
,
MYF
(
0
));
...
...
storage/tokudb/hatoku_hton.h
View file @
9c47f41e
...
@@ -133,7 +133,6 @@ static uint get_pk_insert_mode(THD* thd) {
...
@@ -133,7 +133,6 @@ static uint get_pk_insert_mode(THD* thd) {
return
THDVAR
(
thd
,
pk_insert_mode
);
return
THDVAR
(
thd
,
pk_insert_mode
);
}
}
static
MYSQL_THDVAR_BOOL
(
load_save_space
,
static
MYSQL_THDVAR_BOOL
(
load_save_space
,
0
,
0
,
"if on, intial loads are slower but take less space"
,
"if on, intial loads are slower but take less space"
,
...
@@ -260,10 +259,6 @@ static MYSQL_THDVAR_BOOL(disable_slow_update,
...
@@ -260,10 +259,6 @@ static MYSQL_THDVAR_BOOL(disable_slow_update,
false
// default
false
// default
);
);
static
bool
get_disable_slow_update
(
THD
*
thd
)
{
return
(
THDVAR
(
thd
,
disable_slow_update
)
!=
0
);
}
static
MYSQL_THDVAR_BOOL
(
disable_slow_upsert
,
static
MYSQL_THDVAR_BOOL
(
disable_slow_upsert
,
PLUGIN_VAR_THDLOCAL
,
PLUGIN_VAR_THDLOCAL
,
"disable slow upsert"
,
"disable slow upsert"
,
...
@@ -271,10 +266,6 @@ static MYSQL_THDVAR_BOOL(disable_slow_upsert,
...
@@ -271,10 +266,6 @@ static MYSQL_THDVAR_BOOL(disable_slow_upsert,
NULL
,
// update
NULL
,
// update
false
// default
false
// default
);
);
static
bool
get_disable_slow_upsert
(
THD
*
thd
)
{
return
(
THDVAR
(
thd
,
disable_slow_upsert
)
!=
0
);
}
#endif
#endif
static
MYSQL_THDVAR_UINT
(
analyze_time
,
static
MYSQL_THDVAR_UINT
(
analyze_time
,
...
@@ -348,12 +339,6 @@ static MYSQL_THDVAR_UINT(lock_timeout_debug, 0, "TokuDB lock timeout debug", NUL
...
@@ -348,12 +339,6 @@ static MYSQL_THDVAR_UINT(lock_timeout_debug, 0, "TokuDB lock timeout debug", NUL
static
MYSQL_THDVAR_STR
(
last_lock_timeout
,
PLUGIN_VAR_MEMALLOC
,
"last TokuDB lock timeout"
,
NULL
,
NULL
,
NULL
);
static
MYSQL_THDVAR_STR
(
last_lock_timeout
,
PLUGIN_VAR_MEMALLOC
,
"last TokuDB lock timeout"
,
NULL
,
NULL
,
NULL
);
extern
HASH
tokudb_open_tables
;
extern
HASH
tokudb_open_tables
;
extern
pthread_mutex_t
tokudb_mutex
;
extern
pthread_mutex_t
tokudb_mutex
;
extern
pthread_mutex_t
tokudb_meta_mutex
;
extern
pthread_mutex_t
tokudb_meta_mutex
;
...
...
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