Commit a3be64bf authored by monty@donna.mysql.fi's avatar monty@donna.mysql.fi
Browse files

Fixed that MySQL compiles again after last merge.

parent 47b1235e

myisam/myisamdef.h

+2 −0
Original line number Diff line number Diff line
@@ -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;

mysql-test/r/innodb.result

+1 −1
Original line number Diff line number Diff line
@@ -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

sql/mysql_priv.h

+3 −2
Original line number Diff line number Diff line
@@ -414,7 +414,8 @@ 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,

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,