mirror of
https://github.com/MariaDB/server.git
synced 2026-05-07 15:45:33 +02:00
Added new status variables:
feature_dynamic_columns,feature_fulltext,feature_gis,feature_locale,feature_subquery,feature_timezone,feature_trigger,feature_xml Opened_views, Executed_triggers, Executed_events Added new process status 'updating status' as part of 'freeing items' mysql-test/r/features.result: Test of feature_xxx status variables mysql-test/r/mysqld--help.result: Removed duplicated 'language' variable. mysql-test/r/view.result: Test of opened_views mysql-test/suite/rpl/t/rpl_start_stop_slave.test: Write more information on failure mysql-test/t/features.test: Test of feature_xxx status variables mysql-test/t/view.test: Test of opened_views sql/event_scheduler.cc: Increment executed_events status variable sql/field.cc: Increment status variable sql/item_func.cc: Increment status variable sql/item_strfunc.cc: Increment status variable sql/item_subselect.cc: Increment status variable sql/item_xmlfunc.cc: Increment status variable sql/mysqld.cc: Add new status variables to 'show status' sql/mysqld.h: Added executed_events sql/sql_base.cc: Increment status variable sql/sql_class.h: Add new status variables sql/sql_parse.cc: Added new process status 'updating status' as part of 'freeing items' sql/sql_trigger.cc: Increment status variable sql/sys_vars.cc: Increment status variable sql/tztime.cc: Increment status variable
This commit is contained in:
parent
5161b3ddde
commit
3a793b9d4d
20 changed files with 328 additions and 21 deletions
|
|
@ -3578,22 +3578,25 @@ static bool check_locale(sys_var *self, THD *thd, set_var *var)
|
|||
|
||||
if (!locale->errmsgs->errmsgs)
|
||||
{
|
||||
bool res;
|
||||
mysql_mutex_lock(&LOCK_error_messages);
|
||||
if (!locale->errmsgs->errmsgs &&
|
||||
read_texts(ERRMSG_FILE, locale->errmsgs->language,
|
||||
&locale->errmsgs->errmsgs,
|
||||
ER_ERROR_LAST - ER_ERROR_FIRST + 1))
|
||||
res= (!locale->errmsgs->errmsgs &&
|
||||
read_texts(ERRMSG_FILE, locale->errmsgs->language,
|
||||
&locale->errmsgs->errmsgs,
|
||||
ER_ERROR_LAST - ER_ERROR_FIRST + 1));
|
||||
mysql_mutex_unlock(&LOCK_error_messages);
|
||||
if (res)
|
||||
{
|
||||
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_UNKNOWN_ERROR,
|
||||
"Can't process error message file for locale '%s'",
|
||||
locale->name);
|
||||
mysql_mutex_unlock(&LOCK_error_messages);
|
||||
return true;
|
||||
}
|
||||
mysql_mutex_unlock(&LOCK_error_messages);
|
||||
}
|
||||
status_var_increment(thd->status_var.feature_locale);
|
||||
return false;
|
||||
}
|
||||
|
||||
static Sys_var_struct Sys_lc_messages(
|
||||
"lc_messages", "Set the language used for the error messages",
|
||||
SESSION_VAR(lc_messages), NO_CMD_LINE,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue