Commit c6240dcd authored by unknown's avatar unknown
Browse files

Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  127.(none):/home/osku/mysql/5.0/clean
parents 706731cf bb292ca1

innobase/include/trx0trx.h

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ void 
trx_set_detailed_error(

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

	trx_t*		trx,	/* in: transaction struct */

	char*	msg);	/* in: detailed error message */

	const char*	msg);	/* in: detailed error message */

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

Set detailed error message for the transaction from a file. Note that the

file is rewinded before reading from it. */

innobase/trx/trx0trx.c

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ void 
trx_set_detailed_error(

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

	trx_t*		trx,	/* in: transaction struct */

	char*	msg)	/* in: detailed error message */

	const char*	msg)	/* in: detailed error message */

{

	ut_strlcpy(trx->detailed_error, msg, sizeof(trx->detailed_error));

}