Commit eee5f15b authored by unknown's avatar unknown
Browse files

manual merged (blame me!) 


Build-tools/Do-compile:
  Auto merged
Docs/Makefile.am:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/include/lock0lock.h:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/sync0arr.h:
  Auto merged
innobase/include/trx0trx.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
mysql-test/r/innodb.result:
  to be fixed after the merge
parents d57d78ac b940ae10

Build-tools/Do-compile

+14 −12
Original line number Diff line number Diff line
@@ -171,6 +171,17 @@ info("PATH is $ENV{PATH}"); 


log_timestamp();



$md5_result= safe_system("perl $ENV{HOME}/my_md5sum -c ${opt_distribution}.md5");



if ($md5_result != 0)

{

  abort("MD5 check failed for $opt_distribution!");

}

else

{

  info("SUCCESS: MD5 checks for $opt_distribution");

}



if (-x "$host/bin/mysqladmin")

{

  log_system("$host/bin/mysqladmin $mysqladmin_args -S $mysql_unix_port -s shutdown");
@@ -204,17 +215,6 @@ if ($opt_stage == 0) 
safe_cd($host);

if ($opt_stage == 0 && ! $opt_use_old_distribution)

{

  $md5_result= safe_system("./my_md5sum -c ${opt_distribution}.md5");



  if ($md5_result != 0)

  {

	abort("MD5 failed for $opt_distribution!");

  }

  else

  {

	info("SUCCESS: MD5 checks for $opt_distribution");

  }



  safe_system("gunzip < $opt_distribution | $tar xf -");



  # Fix file times; This is needed because the time for files may be
@@ -343,7 +343,9 @@ $tar_file=<$pwd/$host/mysql*.t*gz>; 
abort ("Could not find tarball!") unless ($tar_file);



# Generate the MD5 for the binary distribution

safe_system("./my_md5sum $tar_file > ${tar_file}.md5}");

$tar_file=~ /(mysql[^\/]*)\.(tar\.gz|tgz)/;

$tar_file_lite= "$1.$2";

system("cd $pwd/$host; perl $ENV{HOME}/my_md5sum $tar_file_lite > ${tar_file_lite}.md5");



#

# Unpack the binary distribution

innobase/btr/btr0cur.c

+9 −2
Original line number Diff line number Diff line
@@ -2717,8 +2717,11 @@ btr_estimate_number_of_different_key_vals( 
			rec = page_rec_get_next(rec);

		}

		



		if (n_cols == dict_index_get_n_unique_in_tree(index)) {

			/* We add one because we know that the first record



			/* If there is more than one leaf page in the tree,

			we add one because we know that the first record

			on the page certainly had a different prefix than the

			last record on the previous index page in the

			alphabetical order. Before this fix, if there was
@@ -2726,8 +2729,12 @@ btr_estimate_number_of_different_key_vals( 
			algorithm grossly underestimated the number of rows

			in the table. */



			if (btr_page_get_prev(page, &mtr) != FIL_NULL

			    || btr_page_get_next(page, &mtr) != FIL_NULL) {



				n_diff[n_cols]++;

			}

		}



		total_external_size +=

				btr_rec_get_externally_stored_len(rec);

innobase/include/lock0lock.h

+3 −2
Original line number Diff line number Diff line
@@ -418,7 +418,8 @@ lock_release_off_kernel( 
/*====================*/

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

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

Releases table locks, and releases possible other transactions waiting

Releases table locks explicitly requested with LOCK TABLES (indicated by

lock type LOCK_TABLE_EXP), and releases possible other transactions waiting

because of these locks. */



void
@@ -548,7 +549,7 @@ extern lock_sys_t* lock_sys; 
/* Lock types */

#define LOCK_TABLE	16	/* these type values should be so high that */

#define	LOCK_REC	32	/* they can be ORed to the lock mode */

#define LOCK_TABLE_EXP	80	/* explicit table lock */

#define LOCK_TABLE_EXP	80	/* explicit table lock (80 = 16 + 64) */

#define LOCK_TYPE_MASK	0xF0UL	/* mask used to extract lock type from the

				type_mode field in a lock */

/* Waiting lock flag */

innobase/include/row0mysql.h

+4 −3
Original line number Diff line number Diff line
@@ -161,11 +161,12 @@ row_lock_table_autoinc_for_mysql( 
	row_prebuilt_t*	prebuilt);	/* in: prebuilt struct in the MySQL

					table handle */

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

Unlocks a table lock possibly reserved by trx. */

Unlocks all table locks explicitly requested by trx (with LOCK TABLES,

lock type LOCK_TABLE_EXP). */



void		  	

row_unlock_table_for_mysql(

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

row_unlock_tables_for_mysql(

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

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

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

Sets a table lock on the table mentioned in prebuilt. */

innobase/include/srv0srv.h

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ extern ulint srv_test_n_mutexes; 
extern	ulint	srv_test_array_size;



extern ulint	srv_activity_count;

extern ulint	srv_fatal_semaphore_wait_threshold;



extern mutex_t*	kernel_mutex_temp;/* mutex protecting the server, trx structs,

				query threads, and lock table: we allocate