diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-10-15 16:23:01 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-10-15 16:23:01 +0300 |
| commit | 60fb31ddec27323101ad491bf324da5df2b04ab6 (patch) | |
| tree | 38e01149b27f4d0b0b29f436336f67902beb68fa /sql/sql_class.h | |
| parent | 4f5887b22d5d900a0e6166ff26f50d8c09e969f9 (diff) | |
| parent | cad75f4a429830e1dd9713a16bd13ace17623dc4 (diff) | |
| download | mariadb-git-60fb31ddec27323101ad491bf324da5df2b04ab6.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 15631472895..7c663ce831b 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -708,6 +708,7 @@ class select_create: public select_insert { HA_CREATE_INFO *create_info; MYSQL_LOCK *lock; Field **field; + my_bool do_not_drop; public: select_create (const char *db_name, const char *table_name, HA_CREATE_INFO *create_info_par, @@ -716,8 +717,7 @@ public: List<Item> &select_fields,enum_duplicates duplic) :select_insert (NULL, &select_fields, duplic), db(db_name), name(table_name), extra_fields(&fields_par),keys(&keys_par), - create_info(create_info_par), - lock(0) + create_info(create_info_par), lock(0), do_not_drop(0) {} int prepare(List<Item> &list); bool send_data(List<Item> &values); |