Remove exceptions to the assert, bug has been fixed.
This commit is contained in:
parent
93e38e8a3e
commit
f31c048321
@ -588,16 +588,11 @@ void push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level,
|
|||||||
DBUG_PRINT("enter", ("code: %d, msg: %s", code, msg));
|
DBUG_PRINT("enter", ("code: %d, msg: %s", code, msg));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Calling push_warning/push_warning_printf with a
|
Calling push_warning/push_warning_printf with a level of
|
||||||
level of WARN_LEVEL_ERROR *is* a bug.
|
WARN_LEVEL_ERROR *is* a bug. Either use my_printf_error(),
|
||||||
Either use my_error(), or WARN_LEVEL_WARN.
|
my_error(), or WARN_LEVEL_WARN.
|
||||||
Please fix the calling code, and do *NOT*
|
|
||||||
add more work around code in the assert below.
|
|
||||||
*/
|
*/
|
||||||
DBUG_ASSERT( (level != MYSQL_ERROR::WARN_LEVEL_ERROR)
|
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 */
|
|
||||||
);
|
|
||||||
|
|
||||||
if (level == MYSQL_ERROR::WARN_LEVEL_ERROR)
|
if (level == MYSQL_ERROR::WARN_LEVEL_ERROR)
|
||||||
level= MYSQL_ERROR::WARN_LEVEL_WARN;
|
level= MYSQL_ERROR::WARN_LEVEL_WARN;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user