An after-fix for
Bug#11765108 - Bug#58036: CLIENT UTF32, UTF16, UCS2 SHOULD BE DISALLOWED, THEY CRASH SERVER Fixing wrong usage of DBUG_ASSERT. In non-debug version thd_init_client_charset was not executed at all.
This commit is contained in:
parent
845e36e1a9
commit
165660fd29
@ -1218,7 +1218,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
|
|||||||
We have checked charset earlier,
|
We have checked charset earlier,
|
||||||
so thd_init_client_charset cannot fail.
|
so thd_init_client_charset cannot fail.
|
||||||
*/
|
*/
|
||||||
DBUG_ASSERT(!thd_init_client_charset(thd, cs_number));
|
if (thd_init_client_charset(thd, cs_number))
|
||||||
|
DBUG_ASSERT(0);
|
||||||
thd->update_charset();
|
thd->update_charset();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user