1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

missing element in prelocked_mode_name[] array

Browse Source 
different fix for a63a250d40:

BUG#23509275 :DBUG_PRINT in THD::decide_logging_format prints incorrectly, access out-of-bound
This commit is contained in:
Sergei Golubchik 2016-09-11 20:53:16 +02:00
parent a229091953
commit 611dc0dcf4
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.cc
View File

@ -4736,9 +4736,11 @@ int THD::decide_logging_format(TABLE_LIST *tables)
{ {
static const char *prelocked_mode_name[] = { static const char *prelocked_mode_name[] = {
"NON_PRELOCKED", "NON_PRELOCKED",
"LOCK_TABLES",
"PRELOCKED", "PRELOCKED",
"PRELOCKED_UNDER_LOCK_TABLES", "PRELOCKED_UNDER_LOCK_TABLES",
}; };
compile_time_assert(array_elements(prelocked_mode_name) == LTM_always_last);
DBUG_PRINT("debug", ("prelocked_mode: %s", DBUG_PRINT("debug", ("prelocked_mode: %s",
prelocked_mode_name[locked_tables_mode])); prelocked_mode_name[locked_tables_mode]));
} }

3
sql/sql_class.h
View File

@ -1075,7 +1075,8 @@ enum enum_locked_tables_mode
LTM_NONE= 0, LTM_NONE= 0,
LTM_LOCK_TABLES, LTM_LOCK_TABLES,
LTM_PRELOCKED, LTM_PRELOCKED,
LTM_PRELOCKED_UNDER_LOCK_TABLES LTM_PRELOCKED_UNDER_LOCK_TABLES,
LTM_always_last
}; };