Commit 8482d147 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss20 

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss20


innobase/btr/btr0sea.c:
  Null merged
innobase/fil/fil0fil.c:
  Null merged
parents d42c472e 8eaf6f11

innobase/include/btr0sea.ic

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ Updates the search info. */ 
void

btr_search_info_update_slow(

/*========================*/

	btr_search_t*	info,	/* in: search info */

	btr_search_t*	info,	/* in/out: search info */

	btr_cur_t*	cursor);/* in: cursor which was just positioned */



/************************************************************************