diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-11-21 20:08:12 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-11-21 20:08:12 +0200 |
| commit | d40bdbd4ca9c53b286ea69a82e215bb39137af9a (patch) | |
| tree | 76a673d7a9b20f184988993cc14ce455b1d73f70 /sql/sql_view.h | |
| parent | 7ef074540a82703aa01ee5b64a891e9e7163b027 (diff) | |
| parent | 24df987b2013b599136dd064e9156157817c42d0 (diff) | |
| download | mariadb-git-d40bdbd4ca9c53b286ea69a82e215bb39137af9a.tar.gz | |
merge
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_view.h')
| -rw-r--r-- | sql/sql_view.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_view.h b/sql/sql_view.h index 3248c8819f5..8efa9afeccb 100644 --- a/sql/sql_view.h +++ b/sql/sql_view.h @@ -25,7 +25,7 @@ bool mysql_drop_view(THD *thd, TABLE_LIST *view, enum_drop_mode drop_mode); bool check_key_in_view(THD *thd, TABLE_LIST * view); -void insert_view_fields(List<Item> *list, TABLE_LIST *view); +int insert_view_fields(List<Item> *list, TABLE_LIST *view); frm_type_enum mysql_frm_type(char *path); |