From 66edfe285a208e651ddb7cae4cf193bcc493114b Mon Sep 17 00:00:00 2001
From: unknown <holyfoot@deer.(none)>
Date: Wed, 3 May 2006 17:43:32 +0500
Subject: merging fix

---
 sql/sql_table.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql')

diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index f6de9e34785..e9be44d7f24 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -2570,7 +2570,7 @@ send_result_message:
         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
         {
-- 
cgit v1.2.1