diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-11-03 16:43:05 +0200 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-11-03 16:43:05 +0200 |
| commit | 4b63b4adc0dc2326fb586d6ace066af44ff374a4 (patch) | |
| tree | f94ddc1a213afc4561ed6cb318761890998bf895 /sql/sql_view.h | |
| parent | fa8dafe5bba7b4c72c1e0bbf10d7a9e10b4ebe8a (diff) | |
| parent | 5af7ca80d98459b9c163328eaf8709abdf8c9883 (diff) | |
| download | mariadb-git-4b63b4adc0dc2326fb586d6ace066af44ff374a4.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_view.h:
Auto merged
sql/table.cc:
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 f58fe1fc6ca..cd61d7e9e71 100644 --- a/sql/sql_view.h +++ b/sql/sql_view.h @@ -27,7 +27,7 @@ bool check_key_in_view(THD *thd, TABLE_LIST * view); bool insert_view_fields(THD *thd, List<Item> *list, TABLE_LIST *view); -frm_type_enum mysql_frm_type(char *path); +frm_type_enum mysql_frm_type(THD *thd, char *path, db_type *dbt); int view_checksum(THD *thd, TABLE_LIST *view); |