diff options
| author | Alexander Barkov <alexander.barkov@oracle.com> | 2011-03-03 11:25:37 +0300 |
|---|---|---|
| committer | Alexander Barkov <alexander.barkov@oracle.com> | 2011-03-03 11:25:37 +0300 |
| commit | 165660fd29b1829d03faabd876140d5f29e47048 (patch) | |
| tree | 22413055e19c57e8efa6c6334c5ec4587ce45873 /sql/sql_parse.cc | |
| parent | 845e36e1a918ae8c32c6c3722287d57bbd66ae3c (diff) | |
| download | mariadb-git-165660fd29b1829d03faabd876140d5f29e47048.tar.gz | |
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.
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 9bf55f4dcdd..8ef23806d91 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1218,7 +1218,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd, We have checked charset earlier, 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(); } } |