diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-07-19 20:01:13 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-07-19 20:01:13 +0500 |
| commit | e395b0ace21cc39c09c2c90552e04fdab1fb4329 (patch) | |
| tree | 1540d1ba90c7b1e0aede469edf35bf88e694c4ca /sql/sql_class.h | |
| parent | 8e500b7b75c94ad467a18adfddf6eebd28912281 (diff) | |
| parent | 8bbaf6addd99a477a66c8322d44177dbdac4e4e8 (diff) | |
| download | mariadb-git-e395b0ace21cc39c09c2c90552e04fdab1fb4329.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.1
into gleb.loc:/home/uchum/work/bk/5.1-opt
client/mysqldump.c:
Auto merged
include/my_base.h:
Auto merged
mysql-test/include/mix1.inc:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 497b841e1fb..2015fa404ce 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2016,8 +2016,8 @@ class select_insert :public select_result_interceptor { class select_create: public select_insert { ORDER *group; TABLE_LIST *create_table; - TABLE_LIST *select_tables; HA_CREATE_INFO *create_info; + TABLE_LIST *select_tables; Alter_info *alter_info; Field **field; public: |