diff options
| author | monty@donna.mysql.fi <> | 2001-05-20 16:08:09 +0300 |
|---|---|---|
| committer | monty@donna.mysql.fi <> | 2001-05-20 16:08:09 +0300 |
| commit | a3be64bfa519ff04d5b6a9be8dfb2e255ee3862b (patch) | |
| tree | 44b5fdc74a98a393190bedb76517e514ffa8e69f | |
| parent | 47b1235e402adcaf6e076c80a9b97b10573b3241 (diff) | |
| download | mariadb-git-a3be64bfa519ff04d5b6a9be8dfb2e255ee3862b.tar.gz | |
Fixed that MySQL compiles again after last merge.
| -rw-r--r-- | myisam/myisamdef.h | 2 | ||||
| -rw-r--r-- | mysql-test/r/innodb.result | 2 | ||||
| -rw-r--r-- | sql/mysql_priv.h | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/myisam/myisamdef.h b/myisam/myisamdef.h index d309bbc9c8e..7c8a4a113f4 100644 --- a/myisam/myisamdef.h +++ b/myisam/myisamdef.h @@ -531,6 +531,8 @@ extern int _mi_read_rnd_pack_record(MI_INFO*, byte *,my_off_t, my_bool); extern int _mi_pack_rec_unpack(MI_INFO *info,byte *to,byte *from, ulong reclength); extern ulonglong mi_safe_mul(ulonglong a,ulonglong b); +extern int _mi_ft_update(MI_INFO *info, uint keynr, byte *keybuf, + const byte *oldrec, const byte *newrec, my_off_t pos); struct st_sort_info; diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index f030b7fa763..386313505e8 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -115,7 +115,7 @@ t1 index level level 1 NULL 39 where used; Using index table type possible_keys key key_len ref rows Extra t1 index level level 1 NULL 39 where used; Using index table type possible_keys key key_len ref rows Extra -t1 ref level level 1 const 12 +t1 ALL level NULL NULL NULL 39 where used level id 1 1002 1 1003 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); |