diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-07-17 11:33:26 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-07-17 11:33:26 -0600 |
| commit | 3e09e4adce41d2d92792a70b4736f4afaa959b57 (patch) | |
| tree | fa600ff5ab435234ed89e8b62b93eb17e01bb5a3 /sql/sql_class.h | |
| parent | ba6b937620a1502b42a4e841e8e787b6fac4c653 (diff) | |
| parent | 8bbaf6addd99a477a66c8322d44177dbdac4e4e8 (diff) | |
| download | mariadb-git-3e09e4adce41d2d92792a70b4736f4afaa959b57.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
mysql-test/suite/rpl_ndb/t/disabled.def:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.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 b9aa6ce66a2..f60ec2cfb61 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2043,8 +2043,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: |