From 9c6d75e85d8249c3d853aab3a1b6a4e2cbbd1f98 Mon Sep 17 00:00:00 2001
From: "davi@moksha.local" <>
Date: Fri, 28 Sep 2007 19:11:26 -0300
Subject: [PATCH] Post-merge fix for Bug 21136, initial merge missed the
 modifications for the sql_class.h file.

---
 sql/sql_class.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sql/sql_class.h b/sql/sql_class.h
index 7875870bd1a..97a63ed9448 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -2133,6 +2133,10 @@ class select_create: public select_insert {
   TABLE_LIST *select_tables;
   Alter_info *alter_info;
   Field **field;
+  /* lock data for tmp table */
+  MYSQL_LOCK *m_lock;
+  /* m_lock or thd->extra_lock */
+  MYSQL_LOCK **m_plock;
 public:
   select_create (TABLE_LIST *table_arg,
 		 HA_CREATE_INFO *create_info_par,
@@ -2143,7 +2147,8 @@ public:
     create_table(table_arg),
     create_info(create_info_par),
     select_tables(select_tables_arg),
-    alter_info(alter_info_arg)
+    alter_info(alter_info_arg),
+    m_plock(NULL)
     {}
   int prepare(List<Item> &list, SELECT_LEX_UNIT *u);