Commit c9415c77 authored by unknown's avatar unknown
Browse files

Merge lgrimmer@bk-internal:/home/bk/mysql-5.0 

into mysql.com:/space/my/mysql-5.0
parents 3f27ee6d 8ad10851

innobase/btr/btr0pcur.c

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ btr_pcur_restore_position( 
			     && cursor->pos_state != BTR_PCUR_IS_POSITIONED)) {

		ut_print_buf(stderr, (const byte*)cursor, sizeof(btr_pcur_t));

		if (cursor->trx_if_known) {

			trx_print(stderr, cursor->trx_if_known);

			trx_print(stderr, cursor->trx_if_known, 0);

		}

		

		ut_error;

innobase/include/trx0trx.h

+9 −6
Original line number Diff line number Diff line
@@ -329,17 +329,20 @@ trx_commit_step( 
/*============*/

				/* out: query thread to run next, or NULL */

	que_thr_t*	thr);	/* in: query thread */



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

Prints info about a transaction to the standard output. The caller must

own the kernel mutex and must have called

innobase_mysql_prepare_print_arbitrary_thd(), unless he knows that MySQL or

InnoDB cannot meanwhile change the info printed here. */

Prints info about a transaction to the given file. The caller must own the

kernel mutex and must have called

innobase_mysql_prepare_print_arbitrary_thd(), unless he knows that MySQL

or InnoDB cannot meanwhile change the info printed here. */



void

trx_print(

/*======*/

	FILE*	f,		/* in: output stream */

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

	trx_t*	trx,		/* in: transaction */

	uint	max_query_len);	/* in: max query length to print, or 0 to

				   use the default max length */



#ifndef UNIV_HOTBACKUP

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

innobase/lock/lock0lock.c

+4 −4
Original line number Diff line number Diff line
@@ -3297,7 +3297,7 @@ lock_deadlock_recursive( 


				fputs("\n*** (1) TRANSACTION:\n", ef);



				trx_print(ef, wait_lock->trx);

				trx_print(ef, wait_lock->trx, 3000);



				fputs(

			"*** (1) WAITING FOR THIS LOCK TO BE GRANTED:\n", ef);
@@ -3310,7 +3310,7 @@ lock_deadlock_recursive( 
			

				fputs("*** (2) TRANSACTION:\n", ef);



				trx_print(ef, lock->trx);

				trx_print(ef, lock->trx, 3000);



				fputs("*** (2) HOLDS THE LOCK(S):\n", ef);
@@ -4207,7 +4207,7 @@ lock_print_info_all_transactions( 
	while (trx) {

		if (trx->conc_state == TRX_NOT_STARTED) {

			fputs("---", file);

			trx_print(file, trx);

			trx_print(file, trx, 600);

		}

			

		trx = UT_LIST_GET_NEXT(mysql_trx_list, trx);
@@ -4239,7 +4239,7 @@ lock_print_info_all_transactions( 


	if (nth_lock == 0) {

		fputs("---", file);

		trx_print(file, trx);

		trx_print(file, trx, 600);

		

	        if (trx->read_view) {

			fprintf(file,

innobase/row/row0ins.c

+3 −3
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ row_ins_foreign_report_err( 
	rewind(ef);

	ut_print_timestamp(ef);

	fputs(" Transaction:\n", ef);

	trx_print(ef, trx);

	trx_print(ef, trx, 600);



	fputs("Foreign key constraint fails for table ", ef);

	ut_print_name(ef, trx, foreign->foreign_table_name);
@@ -653,7 +653,7 @@ row_ins_foreign_report_add_err( 
	rewind(ef);

	ut_print_timestamp(ef);

	fputs(" Transaction:\n", ef);

	trx_print(ef, trx);

	trx_print(ef, trx, 600);

	fputs("Foreign key constraint fails for table ", ef);

	ut_print_name(ef, trx, foreign->foreign_table_name);

	fputs(":\n", ef);
@@ -1228,7 +1228,7 @@ row_ins_check_foreign_constraint( 
			rewind(ef);

			ut_print_timestamp(ef);

			fputs(" Transaction:\n", ef);

			trx_print(ef, trx);

			trx_print(ef, trx, 600);

			fputs("Foreign key constraint fails for table ", ef);

			ut_print_name(ef, trx, foreign->foreign_table_name);

			fputs(":\n", ef);

innobase/row/row0sel.c

+3 −3
Original line number Diff line number Diff line
@@ -2685,7 +2685,7 @@ row_sel_get_clust_rec_for_mysql( 
				"InnoDB: clust index record ", stderr);

			rec_print(stderr, clust_rec, clust_index);

			putc('\n', stderr);

			trx_print(stderr, trx);

			trx_print(stderr, trx, 600);



			fputs("\n"

"InnoDB: Submit a detailed bug report to http://bugs.mysql.com\n", stderr);
@@ -3128,7 +3128,7 @@ row_search_for_mysql( 
"InnoDB: Error: MySQL is trying to perform a SELECT\n"

"InnoDB: but it has not locked any tables in ::external_lock()!\n",

                      stderr);

		trx_print(stderr, trx);

		trx_print(stderr, trx, 600);

                fputc('\n', stderr);

	}
@@ -3455,7 +3455,7 @@ row_search_for_mysql( 
			fputs(

"InnoDB: Error: MySQL is trying to perform a consistent read\n"

"InnoDB: but the read view is not assigned!\n", stderr);

			trx_print(stderr, trx);

			trx_print(stderr, trx, 600);

                        fputc('\n', stderr);

			ut_a(0);

		}