diff options
| author | unknown <thek@adventure.(none)> | 2007-07-29 13:08:21 +0200 |
|---|---|---|
| committer | unknown <thek@adventure.(none)> | 2007-07-29 13:08:21 +0200 |
| commit | 5114cb91e58d2d402782c58977f6d03345f93763 (patch) | |
| tree | 7a1a76cf7130547455dde82fd4e33426f902f65d /sql/table.h | |
| parent | 2e23c6f09051ba86fe46d471cc37628097b8c367 (diff) | |
| parent | a16919e473d49f2ec6c374f36b40a591fe6ee74a (diff) | |
| download | mariadb-git-5114cb91e58d2d402782c58977f6d03345f93763.tar.gz | |
Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/table.h b/sql/table.h index 77d8e819d3e..cc0374971d1 100644 --- a/sql/table.h +++ b/sql/table.h @@ -1148,7 +1148,6 @@ struct TABLE_LIST */ bool process_index_hints(TABLE *table); - void set_trg_event_type(const st_lex *lex); private: bool prep_check_option(THD *thd, uint8 check_opt_type); bool prep_where(THD *thd, Item **conds, bool no_where_clause); |