From 9b352548fbe9c59a82067ec0123dba0703263a30 Mon Sep 17 00:00:00 2001
From: unknown <pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se>
Date: Thu, 25 Aug 2005 15:02:40 -0400
Subject: [PATCH] Merge fixes

---
 sql/sql_base.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index ac2318aee89..1d5fa32123d 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -3598,7 +3598,7 @@ mark_common_columns(THD *thd, TABLE_LIST *table_ref_1, TABLE_LIST *table_ref_2,
 
       if (field_1)
       {
-        TABLE *table_1= nj_col1->table_ref->table;
+        TABLE *table_1= nj_col_1->table_ref->table;
         /* Mark field_1 used for table cache. */
         field_1->query_id= thd->query_id;
         table_1->file->ha_set_bit_in_read_set(field_1->fieldnr);
@@ -3606,7 +3606,7 @@ mark_common_columns(THD *thd, TABLE_LIST *table_ref_1, TABLE_LIST *table_ref_2,
       }
       if (field_2)
       {
-        TABLE *table_2= nj_col2->table_ref->table;
+        TABLE *table_2= nj_col_2->table_ref->table;
         /* Mark field_2 used for table cache. */
         field_2->query_id= thd->query_id;
         table_2->file->ha_set_bit_in_read_set(field_1->fieldnr);