merging fix

81e625ac · holyfoot@deer.(none) · f66bcd25 · 81e625ac
Commit 81e625ac authored May 03, 2006 by holyfoot@deer.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_table.cc sql/sql_table.cc +1 -1

No files found.
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -2570,7 +2570,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
        table->table->s->version=0;               // Force close of table
      else if (open_for_modify)
      {
-        if (table->table->tmp_table)
+        if (table->table->s->tmp_table)
          table->table->file->info(HA_STATUS_CONST);
        else
        {