Commit 66edfe28 authored by unknown's avatar unknown

merging fix

parent 7d121a7f
...@@ -2570,7 +2570,7 @@ send_result_message: ...@@ -2570,7 +2570,7 @@ send_result_message:
table->table->s->version=0; // Force close of table table->table->s->version=0; // Force close of table
else if (open_for_modify) else if (open_for_modify)
{ {
if (table->table->tmp_table) if (table->table->s->tmp_table)
table->table->file->info(HA_STATUS_CONST); table->table->file->info(HA_STATUS_CONST);
else else
{ {
......
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