diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_innodb.cc | 14 | ||||
| -rw-r--r-- | sql/lex.h | 2 | ||||
| -rw-r--r-- | sql/set_var.cc | 6 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 2 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 4 |
5 files changed, 16 insertions, 12 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 2ae1ff5672d..6577590f14a 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -5550,7 +5550,9 @@ innodb_mutex_show_status( Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF)) DBUG_RETURN(TRUE); -// mutex_enter(&mutex_list_mutex); +#ifdef MUTEX_PROTECT_TO_BE_ADDED_LATER + mutex_enter(&mutex_list_mutex); +#endif mutex = UT_LIST_GET_FIRST(mutex_list); @@ -5572,7 +5574,9 @@ innodb_mutex_show_status( if (protocol->write()) { -// mutex_exit(&mutex_list_mutex); +#ifdef MUTEX_PROTECT_TO_BE_ADDED_LATER + mutex_exit(&mutex_list_mutex); +#endif DBUG_RETURN(1); } } @@ -5602,12 +5606,12 @@ innodb_mutex_show_status( if (protocol->write()) { -// mutex_exit(&mutex_list_mutex); DBUG_RETURN(1); } - -// mutex_exit(&mutex_list_mutex); +#ifdef MUTEX_PROTECT_TO_BE_ADDED_LATER + mutex_exit(&mutex_list_mutex); +#endif send_eof(thd); DBUG_RETURN(FALSE); } diff --git a/sql/lex.h b/sql/lex.h index b052479d413..fe1cf582b5b 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -323,7 +323,7 @@ static SYMBOL symbols[] = { { "MULTILINESTRING", SYM(MULTILINESTRING)}, { "MULTIPOINT", SYM(MULTIPOINT)}, { "MULTIPOLYGON", SYM(MULTIPOLYGON)}, - { "MUTEX", SYM(MUTEX_SYM)}, + { "MUTEX", SYM(MUTEX_SYM)}, { "NAME", SYM(NAME_SYM)}, { "NAMES", SYM(NAMES_SYM)}, { "NATIONAL", SYM(NATIONAL_SYM)}, diff --git a/sql/set_var.cc b/sql/set_var.cc index 4e74ad02ea5..33dd195cbce 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -361,8 +361,8 @@ sys_var_thd_enum sys_tx_isolation("tx_isolation", fix_tx_isolation); sys_var_thd_ulong sys_tmp_table_size("tmp_table_size", &SV::tmp_table_size); -sys_var_bool_ptr sys_timed_mutexes("timed_mutexes", - &timed_mutexes); +sys_var_bool_ptr sys_timed_mutexes("timed_mutexes", + &timed_mutexes); sys_var_thd_ulong sys_net_wait_timeout("wait_timeout", &SV::net_wait_timeout); @@ -904,7 +904,7 @@ struct show_var_st init_vars[]= { {"thread_stack", (char*) &thread_stack, SHOW_LONG}, {sys_time_format.name, (char*) &sys_time_format, SHOW_SYS}, {"time_zone", (char*) &sys_time_zone, SHOW_SYS}, - {sys_timed_mutexes.name, (char*) &sys_timed_mutexes, SHOW_SYS}, + {sys_timed_mutexes.name, (char*) &sys_timed_mutexes, SHOW_SYS}, {sys_tmp_table_size.name, (char*) &sys_tmp_table_size, SHOW_SYS}, {"tmpdir", (char*) &opt_mysql_tmpdir, SHOW_CHAR_PTR}, {sys_trans_alloc_block_size.name, (char*) &sys_trans_alloc_block_size, diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index a622568d9dc..0965e055c41 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2491,7 +2491,7 @@ mysql_execute_command(THD *thd) case SQLCOM_SHOW_MUTEX_STATUS: { if (check_global_access(thd, SUPER_ACL)) - goto error; + goto error; res = innodb_mutex_show_status(thd); break; } diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index eba3b5298af..c2692261521 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -337,7 +337,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token MAX_UPDATES_PER_HOUR %token MEDIUM_SYM %token MIN_ROWS -%token MUTEX_SYM +%token MUTEX_SYM %token NAMES_SYM %token NAME_SYM %token NATIONAL_SYM @@ -6990,7 +6990,7 @@ keyword: | MULTILINESTRING {} | MULTIPOINT {} | MULTIPOLYGON {} - | MUTEX_SYM {} + | MUTEX_SYM {} | NAME_SYM {} | NAMES_SYM {} | NATIONAL_SYM {} |