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

Merge bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.com:/my/mysql-4.1


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
This commit is contained in:
unknown
2003-12-08 12:26:10 +02:00
parent 8bf9ccb627 e505696ffc
commit 43b42ceee1
38 changed files with 193 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/set_var.cc
View File

@ -2482,8 +2482,9 @@ int set_var_password::update(THD *thd)
Functions to handle table_type
****************************************************************************/
/* Based upon sys_var::check_enum() */
bool sys_var_thd_table_type::check(THD *thd, set_var *var)
/* Based upon sys_var::check_enum() */
{
char buff[80];
const char *value;
@ -2506,6 +2507,7 @@ err:
return 1;
}
byte *sys_var_thd_table_type::value_ptr(THD *thd, enum_var_type type,
LEX_STRING *base)
{
@ -2513,9 +2515,10 @@ byte *sys_var_thd_table_type::value_ptr(THD *thd, enum_var_type type,
val= ((type == OPT_GLOBAL) ? global_system_variables.*offset :
thd->variables.*offset);
const char *table_type= ha_get_table_type((enum db_type)val);
return (byte *)table_type;
return (byte *) table_type;
}
void sys_var_thd_table_type::set_default(THD *thd, enum_var_type type)
{
if (type == OPT_GLOBAL)
@ -2524,6 +2527,7 @@ void sys_var_thd_table_type::set_default(THD *thd, enum_var_type type)
thd->variables.*offset= (ulong) (global_system_variables.*offset);
}
bool sys_var_thd_table_type::update(THD *thd, set_var *var)
{
if (var->type == OPT_GLOBAL)
@ -2533,6 +2537,7 @@ bool sys_var_thd_table_type::update(THD *thd, set_var *var)
return 0;
}
/****************************************************************************
Functions to handle sql_mode
****************************************************************************/