Commit 01a38b98 authored by unknown's avatar unknown
Browse files

Merge shellback.(none):/home/msvensson/mysql/bug13310/my50-bug13310 

into  shellback.(none):/home/msvensson/mysql/mysql-5.0
parents 4f1685f6 d33fc7ba

sql/sql_error.cc

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level, 
{

  MYSQL_ERROR *err= 0;

  DBUG_ENTER("push_warning");

  DBUG_PRINT("enter", ("code: %d, msg: %s", code, msg));



  if (level == MYSQL_ERROR::WARN_LEVEL_NOTE &&

      !(thd->options & OPTION_SQL_NOTES))