Commit cb702b0b authored by marko's avatar marko

branches/zip: innobase_get_cset_width(): Cache the value of current_thd.

parent d1ad4c3f
...@@ -973,8 +973,9 @@ innobase_get_cset_width( ...@@ -973,8 +973,9 @@ innobase_get_cset_width(
*mbminlen = cs->mbminlen; *mbminlen = cs->mbminlen;
*mbmaxlen = cs->mbmaxlen; *mbmaxlen = cs->mbmaxlen;
} else { } else {
if (current_thd THD* thd = current_thd;
&& (thd_sql_command(current_thd) == SQLCOM_DROP_TABLE)) {
if (thd && thd_sql_command(thd) == SQLCOM_DROP_TABLE) {
/* Fix bug#46256: allow tables to be dropped if the /* Fix bug#46256: allow tables to be dropped if the
collation is not found, but issue a warning. */ collation is not found, but issue a warning. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment