Commit 14c34d96 authored by Will DeVries's avatar Will DeVries Committed by Sergei Petrunia

Add session variable to enable direct update.

parent 4e45e8a2
...@@ -162,6 +162,7 @@ static MYSQL_THDVAR_BOOL( ...@@ -162,6 +162,7 @@ static MYSQL_THDVAR_BOOL(
NULL, NULL,
1 1
); );
// Per thread derived handler knob // Per thread derived handler knob
static MYSQL_THDVAR_BOOL( static MYSQL_THDVAR_BOOL(
derived_handler, derived_handler,
...@@ -172,6 +173,15 @@ static MYSQL_THDVAR_BOOL( ...@@ -172,6 +173,15 @@ static MYSQL_THDVAR_BOOL(
1 1
); );
static MYSQL_THDVAR_BOOL(
enable_direct_update,
PLUGIN_VAR_NOCMDARG,
"",
NULL,
NULL,
1
);
bool select_handler_setting(THD* thd) bool select_handler_setting(THD* thd)
{ {
return ( thd == NULL ) ? false : THDVAR(thd, select_handler); return ( thd == NULL ) ? false : THDVAR(thd, select_handler);
...@@ -542,8 +552,10 @@ int ha_clustrixdb::update_row(const uchar *old_data, const uchar *new_data) ...@@ -542,8 +552,10 @@ int ha_clustrixdb::update_row(const uchar *old_data, const uchar *new_data)
int ha_clustrixdb::direct_update_rows_init(List<Item> *update_fields) int ha_clustrixdb::direct_update_rows_init(List<Item> *update_fields)
{ {
DBUG_ENTER("ha_clustrixdb::direct_update_rows_init"); DBUG_ENTER("ha_clustrixdb::direct_update_rows_init");
int error_code= 0; THD *thd= ha_thd();
DBUG_RETURN(error_code); if (!THDVAR(thd, enable_direct_update))
DBUG_RETURN(HA_ERR_WRONG_COMMAND);
DBUG_RETURN(0);
} }
int ha_clustrixdb::direct_update_rows(ha_rows *update_rows) int ha_clustrixdb::direct_update_rows(ha_rows *update_rows)
...@@ -1352,6 +1364,7 @@ static struct st_mysql_sys_var* clustrixdb_system_variables[] = ...@@ -1352,6 +1364,7 @@ static struct st_mysql_sys_var* clustrixdb_system_variables[] =
MYSQL_SYSVAR(row_buffer), MYSQL_SYSVAR(row_buffer),
MYSQL_SYSVAR(select_handler), MYSQL_SYSVAR(select_handler),
MYSQL_SYSVAR(derived_handler), MYSQL_SYSVAR(derived_handler),
MYSQL_SYSVAR(enable_direct_update),
NULL NULL
}; };
......
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