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 branch '10.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-04-03 09:34:26 +02:00
parent ac5a534a4c 0a6343909f
commit 3261a78ea1
6 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_select.cc
View File

@ -28263,19 +28263,19 @@ enum explainable_cmd_type
};
static
const char * const explainable_cmd_name []=
const LEX_CSTRING explainable_cmd_name []=
{
"select ",
"insert ",
"replace ",
"update ",
"delete ",
{STRING_WITH_LEN("select ")},
{STRING_WITH_LEN("insert ")},
{STRING_WITH_LEN("replace ")},
{STRING_WITH_LEN("update ")},
{STRING_WITH_LEN("delete ")},
};
static
char const *get_explainable_cmd_name(enum explainable_cmd_type cmd)
const LEX_CSTRING* get_explainable_cmd_name(enum explainable_cmd_type cmd)
{
return explainable_cmd_name[cmd];
return explainable_cmd_name + cmd;
}
static
@ -28577,7 +28577,7 @@ void st_select_lex::print(THD *thd, String *str, enum_query_type query_type)
query_type);
}
if (sel_type == UPDATE_CMD || sel_type == DELETE_CMD)
str->append(STRING_WITH_LEN(get_explainable_cmd_name(sel_type)));
str->append(get_explainable_cmd_name(sel_type));
if (sel_type == DELETE_CMD)
{
str->append(STRING_WITH_LEN(" from "));