summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
authorunknown <lars@mysql.com>2006-06-16 02:52:17 +0200
committerunknown <lars@mysql.com>2006-06-16 02:52:17 +0200
commit40305d7a81863c6586611e1e7af6051554c53169 (patch)
treeb8dbd1a29842457aa46c0be99338c82b21662eda /sql/sql_class.h
parentcc542b2f984fa9f1e33979823916c9e9d987a7d7 (diff)
downloadmariadb-git-40305d7a81863c6586611e1e7af6051554c53169.tar.gz
After merge fixes
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 702c8fee671..866ee7b7a27 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -1611,14 +1611,11 @@ public:
List<Item> &select_fields,enum_duplicates duplic, bool ignore)
:select_insert (NULL, NULL, &select_fields, 0, 0, duplic, ignore),
create_table(table), extra_fields(&fields_par),keys(&keys_par),
- create_info(create_info_par),
- lock(0)
+ create_info(create_info_par)
{}
int prepare(List<Item> &list, SELECT_LEX_UNIT *u);
-#ifdef HAVE_ROW_BASED_REPLICATION
void binlog_show_create_table(TABLE **tables, uint count);
-#endif
void store_values(List<Item> &values);
void send_error(uint errcode,const char *err);
bool send_eof();