database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-6819 st_mysql_show_var::value should be void* not char*

Browse Source
This commit is contained in:
Sergei Golubchik
2015-03-04 10:13:06 +01:00
parent 20cacb0064
commit 18feb62fee
8 changed files with 183 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_show.cc
View File

@ -3132,15 +3132,15 @@ static bool show_status_array(THD *thd, const char *wild,
name_buffer, wild))) &&
(!cond || cond->val_int()))
{
char *value=var->value;
void *value=var->value;
const char *pos, *end; // We assign a lot of const's
if (show_type == SHOW_SYS)
{
sys_var *var= ((sys_var *) value);
sys_var *var= (sys_var *) value;
show_type= var->show_type();
mysql_mutex_lock(&LOCK_global_system_variables);
value= (char*) var->value_ptr(thd, scope, &null_lex_str);
value= var->value_ptr(thd, scope, &null_lex_str);
charset= var->charset(thd);
}
@ -3200,7 +3200,7 @@ static bool show_status_array(THD *thd, const char *wild,
}
case SHOW_CHAR:
{
if (!(pos= value))
if (!(pos= (char*)value))
pos= "";
end= strend(pos);
break;