1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Post-merge fix for Bug 21136, initial merge missed the modifications for

Browse Source 
the sql_class.h file.
This commit is contained in:
davi@moksha.local 2007-09-28 19:11:26 -03:00
parent ae079ec427
commit 9c6d75e85d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_class.h
View File

@ -2133,6 +2133,10 @@ class select_create: public select_insert {
TABLE_LIST *select_tables; TABLE_LIST *select_tables;
Alter_info *alter_info; Alter_info *alter_info;
Field **field; Field **field;
/* lock data for tmp table */
MYSQL_LOCK *m_lock;
/* m_lock or thd->extra_lock */
MYSQL_LOCK **m_plock;
public: public:
select_create (TABLE_LIST *table_arg, select_create (TABLE_LIST *table_arg,
HA_CREATE_INFO *create_info_par, HA_CREATE_INFO *create_info_par,
@ -2143,7 +2147,8 @@ public:
create_table(table_arg), create_table(table_arg),
create_info(create_info_par), create_info(create_info_par),
select_tables(select_tables_arg), 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); int prepare(List<Item> &list, SELECT_LEX_UNIT *u);