Commit eeb2ec16 authored by unknown's avatar unknown

ha_maria.cc:

  Adjust to match storage engine API, 'mysql_var_update_func' function
  prototype changed so that last argument now "void *save" with "const"


storage/maria/ha_maria.cc:
  Adjust to match storage engine API, 'mysql_var_update_func' function
  prototype changed so that last argument now "void *save" with "const"
parent 0000ef5e
...@@ -107,10 +107,10 @@ TYPELIB maria_sync_log_dir_typelib= ...@@ -107,10 +107,10 @@ TYPELIB maria_sync_log_dir_typelib=
static ulong checkpoint_interval; static ulong checkpoint_interval;
static void update_checkpoint_interval(MYSQL_THD thd, static void update_checkpoint_interval(MYSQL_THD thd,
struct st_mysql_sys_var *var, struct st_mysql_sys_var *var,
void *var_ptr, void *save); void *var_ptr, const void *save);
static void update_log_file_size(MYSQL_THD thd, static void update_log_file_size(MYSQL_THD thd,
struct st_mysql_sys_var *var, struct st_mysql_sys_var *var,
void *var_ptr, void *save); void *var_ptr, const void *save);
static MYSQL_SYSVAR_ULONG(block_size, maria_block_size, static MYSQL_SYSVAR_ULONG(block_size, maria_block_size,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
...@@ -2875,7 +2875,7 @@ static struct st_mysql_sys_var* system_variables[]= { ...@@ -2875,7 +2875,7 @@ static struct st_mysql_sys_var* system_variables[]= {
static void update_checkpoint_interval(MYSQL_THD thd, static void update_checkpoint_interval(MYSQL_THD thd,
struct st_mysql_sys_var *var, struct st_mysql_sys_var *var,
void *var_ptr, void *save) void *var_ptr, const void *save)
{ {
ma_checkpoint_end(); ma_checkpoint_end();
ma_checkpoint_init(*(ulong *)var_ptr= (ulong)(*(long *)save)); ma_checkpoint_init(*(ulong *)var_ptr= (ulong)(*(long *)save));
...@@ -2887,7 +2887,7 @@ static void update_checkpoint_interval(MYSQL_THD thd, ...@@ -2887,7 +2887,7 @@ static void update_checkpoint_interval(MYSQL_THD thd,
static void update_log_file_size(MYSQL_THD thd, static void update_log_file_size(MYSQL_THD thd,
struct st_mysql_sys_var *var, struct st_mysql_sys_var *var,
void *var_ptr, void *save) void *var_ptr, const void *save)
{ {
uint32 size= (uint32)((ulong)(*(long *)save)); uint32 size= (uint32)((ulong)(*(long *)save));
translog_set_file_size(size); translog_set_file_size(size);
......
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