diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-11-11 21:18:10 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-11-11 21:18:10 +0200 |
| commit | f99693e137bf72ac5e5c3c07b7174db20f0f2cbe (patch) | |
| tree | b838d2bae358ea54b828bff0e3dfb8a0faf1bc8e /sql/sql_view.h | |
| parent | fdd4ecd64d0f7edb12fbac9fb09944bb96c96b4b (diff) | |
| parent | c0b87c7a04584cb4f670238bf6636f196c7c2183 (diff) | |
| download | mariadb-git-f99693e137bf72ac5e5c3c07b7174db20f0f2cbe.tar.gz | |
merge
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_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_prepare.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 538f548d97b..e6f2caeaead 100644 --- a/sql/sql_view.h +++ b/sql/sql_view.h @@ -25,7 +25,7 @@ int 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); |