Commit edf3929c authored by heikki@hundin.mysql.fi's avatar heikki@hundin.mysql.fi
Browse files

ha_innobase.cc, trx0trx.h, lock0lock.c, trx0trx.c: 

  Add some more safety margin to buffer sizes in prints
parent 933417c1

innobase/include/trx0trx.h

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ void 
trx_print(

/*======*/

	char*	buf,	/* in/out: buffer where to print, must be at least

			500 bytes */

			800 bytes */

	trx_t* trx); 	/* in: transaction */

innobase/lock/lock0lock.c

+2 −2
Original line number Diff line number Diff line
@@ -3625,7 +3625,7 @@ lock_print_info( 
	trx = UT_LIST_GET_FIRST(trx_sys->mysql_trx_list);



	while (trx) {

		if (buf_end - buf < 600) {

		if (buf_end - buf < 900) {

			return;

		}
@@ -3662,7 +3662,7 @@ lock_print_info( 
		return;

	}



	if (buf_end - buf < 600) {

	if (buf_end - buf < 900) {

		return;

	}

innobase/trx/trx0trx.c

+1 −1
Original line number Diff line number Diff line
@@ -1465,7 +1465,7 @@ void 
trx_print(

/*======*/

	char*	buf,	/* in/out: buffer where to print, must be at least

			500 bytes */

			800 bytes */

	trx_t*	trx)	/* in: transaction */

{

        char*   start_of_line;

sql/ha_innobase.cc

+2 −2
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ void 
innobase_mysql_print_thd(

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

	char* buf,	/* in/out: buffer where to print, must be at least

			300 bytes */

			400 bytes */

        void* input_thd)/* in: pointer to a MySQL THD object */

{

  	THD*  thd;
@@ -338,7 +338,7 @@ innobase_mysql_print_thd( 
	  buf=strnmov(buf, thd->query, 150);

  	}  

	*buf='\n';

	/* Here we should add '\0' to the nd of output to mark its end */

	/* Here we should add '\0' to the end of output to mark its end */

#endif

}

}