1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

An after-fix for

Browse Source 
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:
Alexander Barkov 2011-03-03 11:25:37 +03:00
parent 845e36e1a9
commit 165660fd29
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_parse.cc
View File

@ -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();
} }
} }