diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-02-15 18:25:57 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-03-10 19:24:23 +0100 |
| commit | 7af733a5a2cb7f79ffb5ff0129cad6db6f3cc359 (patch) | |
| tree | f8f9cab2cd92e43b5fd20c9ac77f9487ece4e5a7 /sql/sql_parse.cc | |
| parent | 81cffda2e68ea5a155b74f24ae4345388afa963c (diff) | |
| download | mariadb-git-7af733a5a2cb7f79ffb5ff0129cad6db6f3cc359.tar.gz | |
perfschema compilation, test and misc fixes
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 962bf23c0a0..fa5da2cf23d 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -5624,8 +5624,8 @@ mysql_execute_command(THD *thd) DBUG_ASSERT(thd->in_sub_stmt == 0); sp->m_sql_mode= thd->variables.sql_mode; sp->m_sp_share= MYSQL_GET_SP_SHARE(sp->m_handler->type(), - sp->m_db.str, sp->m_db.length, - sp->m_name.str, sp->m_name.length); + sp->m_db.str, static_cast<uint>(sp->m_db.length), + sp->m_name.str, static_cast<uint>(sp->m_name.length)); if (do_execute_sp(thd, lex->sphead)) goto error; break; @@ -6188,6 +6188,7 @@ execute_show_status(THD *thd, TABLE_LIST *all_tables) UINT_MAX, FALSE))) res= execute_sqlcom_select(thd, all_tables); + thd->initial_status_var= NULL; /* Don't log SHOW STATUS commands to slow query log */ thd->server_status&= ~(SERVER_QUERY_NO_INDEX_USED | SERVER_QUERY_NO_GOOD_INDEX_USED); |