mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-09 16:44:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge of merge

Browse source
This commit is contained in:
unknown 2011-09-02 15:36:02 +03:00
commit 429a5557d8
33 changed files with 1709 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sql/sql_base.cc
View file

@ -62,7 +62,7 @@ private:
bool
Prelock_error_handler::handle_error(uint sql_errno,
const char * /* message */,
MYSQL_ERROR::enum_warning_level /* level */,
MYSQL_ERROR::enum_warning_level level,
THD * /* thd */)
{
if (sql_errno == ER_NO_SUCH_TABLE)
@ -71,7 +71,8 @@ Prelock_error_handler::handle_error(uint sql_errno,
return TRUE;
}
m_unhandled_errors++;
if (level == MYSQL_ERROR::WARN_LEVEL_ERROR)
m_unhandled_errors++;
return FALSE;
}