diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-20 08:57:02 -0300 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-20 08:57:02 -0300 |
| commit | f31c0483217ba1de24c1e0bfb1c0c8009006cf4d (patch) | |
| tree | bb6743ddbbdc8111489aa13c34a8a4bb7f63bd11 /sql/sql_error.cc | |
| parent | 93e38e8a3ea9fdbd88a34da487cb2ccbfdaf8c11 (diff) | |
| download | mariadb-git-f31c0483217ba1de24c1e0bfb1c0c8009006cf4d.tar.gz | |
Remove exceptions to the assert, bug has been fixed.
Diffstat (limited to 'sql/sql_error.cc')
| -rw-r--r-- | sql/sql_error.cc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc index cc6529f7b10..e5d0f79b2d7 100644 --- a/sql/sql_error.cc +++ b/sql/sql_error.cc @@ -588,16 +588,11 @@ void push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level, DBUG_PRINT("enter", ("code: %d, msg: %s", code, msg)); /* - Calling push_warning/push_warning_printf with a - level of WARN_LEVEL_ERROR *is* a bug. - Either use my_error(), or WARN_LEVEL_WARN. - Please fix the calling code, and do *NOT* - add more work around code in the assert below. + Calling push_warning/push_warning_printf with a level of + WARN_LEVEL_ERROR *is* a bug. Either use my_printf_error(), + my_error(), or WARN_LEVEL_WARN. */ - DBUG_ASSERT( (level != MYSQL_ERROR::WARN_LEVEL_ERROR) - || (code == ER_CANT_CREATE_TABLE) /* See Bug#47233 */ - || (code == ER_ILLEGAL_HA_CREATE_OPTION) /* See Bug#47233 */ - ); + DBUG_ASSERT(level != MYSQL_ERROR::WARN_LEVEL_ERROR); if (level == MYSQL_ERROR::WARN_LEVEL_ERROR) level= MYSQL_ERROR::WARN_LEVEL_WARN; |