diff options
| author | unknown <monty@donna.mysql.fi> | 2001-05-20 16:08:09 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-05-20 16:08:09 +0300 |
| commit | 8ec67661b4327060a12f9888a1179d5161e4b9c4 (patch) | |
| tree | 44b5fdc74a98a393190bedb76517e514ffa8e69f /sql | |
| parent | 7abb78bcc659daca9c0d4e700644aa0a440572cb (diff) | |
| download | mariadb-git-8ec67661b4327060a12f9888a1179d5161e4b9c4.tar.gz | |
Fixed that MySQL compiles again after last merge.
myisam/myisamdef.h:
Added missing declaration
mysql-test/r/innodb.result:
Changed test based on result from changed optimizer
sql/mysql_priv.h:
Fixed wrong prototype
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysql_priv.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 148cc8d528d..d00eb09a363 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -414,8 +414,9 @@ TABLE *unlink_open_table(THD *thd,TABLE *list,TABLE *find); SQL_SELECT *make_select(TABLE *head, table_map const_tables, table_map read_tables, COND *conds, int *error); Item ** find_item_in_list(Item *item,List<Item> &items); -bool insert_fields(THD *thd,TABLE_LIST *tables, const char *table_name, - List_iterator<Item> *it); +bool insert_fields(THD *thd,TABLE_LIST *tables, + const char *db_name, const char *table_name, + List_iterator<Item> *it); bool setup_tables(TABLE_LIST *tables); int setup_fields(THD *thd,TABLE_LIST *tables,List<Item> &item, bool set_query_id,List<Item> *sum_func_list); |