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

row0mysql.c, row0mysql.h: 

  Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table
parent 9cc2b10b

innobase/include/row0mysql.h

+1 −0
Original line number Diff line number Diff line
@@ -393,6 +393,7 @@ struct row_prebuilt_struct { 
					an SQL statement: we may have to set

					an intention lock on the table,

					create a consistent read view etc. */

        ibool           mysql_has_locked;

	ibool		clust_index_was_generated;

					/* if the user did not define a

					primary key in MySQL, then Innobase

innobase/row/row0mysql.c

+1 −0
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ row_create_prebuilt( 
	prebuilt->trx = NULL;



	prebuilt->sql_stat_start = TRUE;

	prebuilt->mysql_has_locked = FALSE;



	prebuilt->index = NULL;

	prebuilt->n_template = 0;