Commit 12420401 authored by unknown's avatar unknown
Browse files

Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 

into hundin.mysql.fi:/home/marko/k/mysql-4.1


innobase/include/lock0lock.h:
  Auto merged
parents 4579806f 1983ff72

innobase/include/lock0lock.h

+1 −1
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ on the table. */ 


ibool

lock_is_table_exclusive(

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

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

				/* out: TRUE if table is only locked by trx,

				with LOCK_IX, and possibly LOCK_AUTO_INC */

	dict_table_t*	table,	/* in: table */