diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-11-08 03:33:52 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-11-08 03:33:52 +0200 |
| commit | adb6dcb928a8c6f3e6f0ff74db1c02947d86e1c5 (patch) | |
| tree | 0c6570770793ecbf8b121ecfe61c9f338109ecd1 /sql/table.h | |
| parent | bff1d4751da5e74bd005675b04a8217b163da16b (diff) | |
| parent | 79a33fa20ce3982b13999cd9a3d4e188d93cb643 (diff) | |
| download | mariadb-git-adb6dcb928a8c6f3e6f0ff74db1c02947d86e1c5.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-view-5.0
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sql/table.h b/sql/table.h index af7d90a8291..f95be1fcccb 100644 --- a/sql/table.h +++ b/sql/table.h @@ -260,8 +260,6 @@ typedef struct st_table_list st_table_list *ancestor; /* most upper view this table belongs to */ st_table_list *belong_to_view; - /* next_global before adding VIEW tables */ - st_table_list *old_next; Item *where; /* VIEW WHERE clause condition */ Item *check_option; /* WITH CHECK OPTION condition */ LEX_STRING query; /* text of (CRETE/SELECT) statement */ @@ -315,12 +313,6 @@ typedef struct st_table_list void cleanup_items(); bool placeholder() {return derived || view; } void print(THD *thd, String *str); - inline st_table_list *next_independent() - { - if (view) - return old_next; - return next_global; - } } TABLE_LIST; class Item; |