summaryrefslogtreecommitdiff
path: root/sql/sql_error.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_error.cc')
-rw-r--r--sql/sql_error.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc
index c0f76ab0388..c09bfe0aea8 100644
--- a/sql/sql_error.cc
+++ b/sql/sql_error.cc
@@ -103,12 +103,11 @@ void mysql_reset_errors(THD *thd)
MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level,
uint code, const char *msg)
{
- MYSQL_ERROR *err= NULL;
+ MYSQL_ERROR *err= 0;
DBUG_ENTER("push_warning");
if (thd->query_id != thd->warn_id)
mysql_reset_errors(thd);
-
if (thd->spcont &&
thd->spcont->find_handler(code,
((int) level >=