diff options
| author | unknown <thek@adventure.(none)> | 2007-07-27 16:59:09 +0200 |
|---|---|---|
| committer | unknown <thek@adventure.(none)> | 2007-07-27 16:59:09 +0200 |
| commit | a16919e473d49f2ec6c374f36b40a591fe6ee74a (patch) | |
| tree | 2e824045918d440c4a358a6bfd2a0c2a2fe9e473 /sql/table.h | |
| parent | ef7cf7d07f8d4e47432090aa31859d85e927ab1b (diff) | |
| parent | 07955aea2dc369be7637f28331bd1072a995d572 (diff) | |
| download | mariadb-git-a16919e473d49f2ec6c374f36b40a591fe6ee74a.tar.gz | |
Merge adventure.(none):/home/thek/Development/cpp/bug29929/my50-bug29929
into adventure.(none):/home/thek/Development/cpp/bug29929/my51-bug29929
mysql-test/r/sp-prelocking.result:
Auto merged
mysql-test/t/sp-prelocking.test:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
SCCS 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 494b74d564c..4eaeec388d2 100644 --- a/sql/table.h +++ b/sql/table.h @@ -1052,7 +1052,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); |