Commit 3155bc81 authored by unknown's avatar unknown
Browse files

Merge 


innobase/fil/fil0fil.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/t/ctype_ucs_binlog.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
scripts/make_binary_distribution.sh:
  SCCS merged
parents 26d75744 a40ecb48

innobase/fil/fil0fil.c

+2 −1
Original line number Diff line number Diff line
@@ -1450,7 +1450,8 @@ fil_write_flushed_lsn_to_data_files( 
		cache. Note that all data files in the system tablespace 0 are

		always open. */



		if (space->purpose == FIL_TABLESPACE) {

		if (space->purpose == FIL_TABLESPACE

		    && space->id == 0) {

			sum_of_sizes = 0;



			node = UT_LIST_GET_FIRST(space->chain);

innobase/row/row0sel.c

+12 −12
Original line number Diff line number Diff line
@@ -3493,13 +3493,13 @@ row_search_for_mysql( 
				err = sel_set_rec_lock(rec, index, offsets,

						prebuilt->select_lock_type,

						LOCK_ORDINARY, thr);

			}



				if (err != DB_SUCCESS) {



					goto lock_wait_or_error;

				}

			}



		}

		/* A page supremum record cannot be in the result set: skip

		it now that we have placed a possible lock on it */
@@ -3606,14 +3606,14 @@ row_search_for_mysql( 
						offsets,

						prebuilt->select_lock_type,

						LOCK_GAP, thr);

				}



					if (err != DB_SUCCESS) {



						goto lock_wait_or_error;

					}

				}



			}



			btr_pcur_store_position(pcur, &mtr);



			err = DB_RECORD_NOT_FOUND;
@@ -3640,14 +3640,14 @@ row_search_for_mysql( 
						offsets,

						prebuilt->select_lock_type,

						LOCK_GAP, thr);

				}



					if (err != DB_SUCCESS) {



						goto lock_wait_or_error;

					}

				}



			}



			btr_pcur_store_position(pcur, &mtr);



			err = DB_RECORD_NOT_FOUND;

mysql-test/t/ctype_ucs_binlog.test

+1 −0
Original line number Diff line number Diff line 
--source include/not_embedded.inc

--source include/have_ucs2.inc



#

# Check correct binlogging of UCS2 user variables (BUG#3875)

sql/ha_innodb.cc

+2 −1
Original line number Diff line number Diff line
@@ -6136,7 +6136,8 @@ ha_innobase::store_lock( 
	    (lock_type == TL_READ_HIGH_PRIORITY && thd->in_lock_tables) ||

	    lock_type == TL_READ_WITH_SHARED_LOCKS ||

	    lock_type == TL_READ_NO_INSERT ||

	    thd->lex->sql_command != SQLCOM_SELECT) {

	    (thd->lex->sql_command != SQLCOM_SELECT

	     && lock_type != TL_IGNORE)) {



		/* The OR cases above are in this order:

		1) MySQL is doing LOCK TABLES ... READ LOCAL, or