database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks

Browse Source
This commit is contained in:
Sergei Petrunia
2017-03-11 20:12:15 +00:00
parent 5c1c2f67ec eded6243bc
commit 5b30c7896e
1755 changed files with 63733 additions and 53790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_show.cc
View File

@ -1069,7 +1069,7 @@ public:
}
bool handle_condition(THD *thd, uint sql_errno, const char * /* sqlstate */,
Sql_condition::enum_warning_level level,
Sql_condition::enum_warning_level *level,
const char *message, Sql_condition ** /* cond_hdl */)
{
/*
@ -4675,7 +4675,7 @@ public:
bool handle_condition(THD *thd,
uint sql_errno,
const char* sqlstate,
Sql_condition::enum_warning_level level,
Sql_condition::enum_warning_level *level,
const char* msg,
Sql_condition ** cond_hdl)
{
@ -4684,7 +4684,7 @@ public:
sql_errno == ER_TRG_NO_CREATION_CTX)
return true;
if (level != Sql_condition::WARN_LEVEL_ERROR)
if (*level != Sql_condition::WARN_LEVEL_ERROR)
return false;
if (!thd->get_stmt_da()->is_error())