branches/innodb+: Merge revisions 3312:3459 from branches/zip:

  ------------------------------------------------------------------------
  r3328 | marko | 2008-12-02 10:16:05 +0200 (Tue, 02 Dec 2008) | 7 lines

  branches/zip: page_cur_insert_rec_zip(): When allocating insert_buf
  from the free list, zero out the DB_TRX_ID and DB_ROLL_PTR of the
  deleted record if the new record would not overwrite these
  fields. This fixes a harmless content mismatch reported by
  page_zip_validate() that was reported as Issue #111.
  rb://55 approved by Sunny Bains.
  ------------------------------------------------------------------------
  r3329 | vasil | 2008-12-02 12:03:17 +0200 (Tue, 02 Dec 2008) | 4 lines

  branches/zip:

  Add entry in the ChangeLog for the release of 1.0.2.
  ------------------------------------------------------------------------
  r3331 | vasil | 2008-12-02 12:09:20 +0200 (Tue, 02 Dec 2008) | 5 lines

  branches/zip:

  Remove an entry from the ChnageLog for a change that was made before
  the release of 1.0.2 but was not included in that release.
  ------------------------------------------------------------------------
  r3333 | vasil | 2008-12-02 12:11:54 +0200 (Tue, 02 Dec 2008) | 4 lines

  branches/zip:

  Now that 1.0.2 is out, the current tree is version 1.0.3.
  ------------------------------------------------------------------------
  r3336 | vasil | 2008-12-02 13:34:36 +0200 (Tue, 02 Dec 2008) | 5 lines

  branches/zip:

  Resurrect a ChangeLog entry that I removed in c3331 with a fake date
  so it does not appear that it has been included in 1.0.2.
  ------------------------------------------------------------------------
  r3361 | vasil | 2008-12-04 18:10:08 +0200 (Thu, 04 Dec 2008) | 9 lines

  branches/zip:

  Fix Mantis issue#103 mysql_addons.c depends on THD internals - please remove it

  Use MySQL's thd_get_thread_id() instead of our own ib_thd_get_thread_id()
  since MySQL implemented the former, see http://bugs.mysql.com/30930.

  Approved by:    Marko (https://svn.innodb.com/rb/r/40, rb://40)
  ------------------------------------------------------------------------
  r3362 | vasil | 2008-12-04 18:49:24 +0200 (Thu, 04 Dec 2008) | 15 lines

  branches/zip:

  Revert our temporary fix for Bug#40360 Binlog related errors with binlog off

  This bug was fixed in MySQL code.

  Our fix went into r2944 and r2947, but this patch does not entirely revert
  those revisions because we want to leave the test case that was introduced
  and also r2944 itself reverted r2935 and r2936. So if we completely revert
  r2944 and r2947 then we would loose the test and will restore r2935 and
  r2936.

  This resolves Issue#108 We should remove ib_bin_log_is_engaged() once mysql
  add an equivallent, see Bug#40360
  ------------------------------------------------------------------------
  r3404 | marko | 2008-12-05 10:02:54 +0200 (Fri, 05 Dec 2008) | 5 lines

  branches/zip: row_undo_mod_del_mark_or_remove_sec_low(): Do not
  complain if the record is not found.  Explain that this is possible
  when a deadlock occurs during an update.  Heikki investigated this
  in Issue #134.
  ------------------------------------------------------------------------
  r3432 | marko | 2008-12-08 14:14:01 +0200 (Mon, 08 Dec 2008) | 4 lines

  branches/zip: ibuf_merge_or_delete_for_page(): Remove the redundant
  checks for ibuf_fixed_addr_page() || fsp_descr_page().  The one at
  the beginning of the function is enough.
  ------------------------------------------------------------------------
  r3456 | marko | 2008-12-09 10:31:26 +0200 (Tue, 09 Dec 2008) | 3 lines

  branches/zip: row_purge_remove_sec_if_poss_low(): Allocate mtr_vers
  from the stack, not with mem_alloc().
  ------------------------------------------------------------------------
  r3459 | vasil | 2008-12-09 11:49:03 +0200 (Tue, 09 Dec 2008) | 152 lines

  branches/zip:

  Merge 2929:3458 from branches/5.1 (resolving conflict in c3257,
  note also that r3363 reverted r2933 so there are not changes in
  mysql-test/innodb-autoinc.result with the current merge):

    ------------------------------------------------------------------------
    r2933 | calvin | 2008-10-30 02:57:31 +0200 (Thu, 30 Oct 2008) | 10 lines
    Changed paths:
       M /branches/5.1/mysql-test/innodb-autoinc.result

    branches/5.1: correct the result file innodb-autoinc.result

    Change the followings:
      auto_increment_increment
      auto_increment_offset

    to
      auto-increment-increment
      auto-increment-offset

    ------------------------------------------------------------------------
    r2981 | marko | 2008-11-07 14:54:10 +0200 (Fri, 07 Nov 2008) | 5 lines
    Changed paths:
       M /branches/5.1/row/row0mysql.c

    branches/5.0: row_mysql_store_col_in_innobase_format(): Correct a misleading
    comment. In the UTF-8 encoding, ASCII takes 1 byte per character, while
    the "latin1" character set (normally ISO-8859-1, but in MySQL it actually
    refers to the Windows Code Page 1252 a.k.a. CP1252, WinLatin1)
    takes 1 to 3 bytes (1 to 2 bytes for the ISO-8859-1 subset).
    ------------------------------------------------------------------------
    r3114 | calvin | 2008-11-14 20:31:48 +0200 (Fri, 14 Nov 2008) | 8 lines
    Changed paths:
       M /branches/5.1/handler/ha_innodb.cc

    branches/5.1: fix bug#40386: Not flushing query cache after truncate

    ha_statistics.records can not be 0 unless the table is empty, set to
    1 instead. The original problem of bug#29507 is fixed in the server.

    Additional test was done with the fix of bug#29507 in the server.

    Approved by: Heikki (on IM)
    ------------------------------------------------------------------------
    r3257 | inaam | 2008-11-24 22:06:50 +0200 (Mon, 24 Nov 2008) | 13 lines
    Changed paths:
       M /branches/5.1/handler/ha_innodb.cc
       M /branches/5.1/srv/srv0srv.c
       M /branches/5.1/trx/trx0trx.c

    branches/5.1 bug#40760

    The config param innodb_thread_concurrency is dynamically set and is
    read when a thread enters/exits innodb. If the value is changed between
    the enter and exit time the behaviour becomes erratic.
    The fix is not to use srv_thread_concurrency when exiting, instead use
    the flag trx->declared_to_be_inside_innodb.

    rb://57

    Approved by: Marko


    ------------------------------------------------------------------------
    r3363 | calvin | 2008-12-04 19:00:20 +0200 (Thu, 04 Dec 2008) | 13 lines
    Changed paths:
       M /branches/5.1/mysql-test/innodb-autoinc.result

    branches/5.1: revert the changes in r2933

    The changes in r2933 causes test failure on Linux.
    More investigation is needed for Windows.

    Change the followings in innodb-autoinc.result:
      auto-increment-increment
      auto-increment-offset

    back to:
      auto_increment_increment
      auto_increment_offset

    ------------------------------------------------------------------------
    r3412 | vasil | 2008-12-05 10:46:18 +0200 (Fri, 05 Dec 2008) | 7 lines
    Changed paths:
       M /branches/5.1/trx/trx0undo.c

    branches/5.1:

    Add the traditional 2 spaces after the timestamp so the message does
    not look like:

    070223 13:26:01InnoDB: Warning: canno....

    ------------------------------------------------------------------------
    r3458 | vasil | 2008-12-09 11:21:08 +0200 (Tue, 09 Dec 2008) | 51 lines
    Changed paths:
       M /branches/5.1/mysql-test/innodb_bug34300.test

    branches/5.1:

    Merge a change from MySQL to fix the failing innodb_bug34300 mysql-test:

      main.innodb_bug34300           [ fail ]

      mysqltest: At line 11: query 'SET @@max_allowed_packet=16777216' failed: 1621: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value

      Aborting: main.innodb_bug34300 failed in default mode.

    The changeset is this:

      ------------------------------------------------------------
      revno: 2709.1.10
      committer: Staale Smedseng <staale.smedseng@sun.com>
      branch nick: b22891-51-bugteam
      timestamp: Thu 2008-11-20 08:51:48 +0100
      message:
        A fix for Bug#22891 "session level max_allowed_packet can be
        set but is ignored".

        This patch makes @@session.max_allowed_packed and
        @@session.net_buffer_length read-only as suggested in the bug
        report. The user will have to use SET GLOBAL (and reconnect)
        to alter the session values of these variables.

        The error string ER_VARIABLE_IS_READONLY is introduced.

        Tests are modified accordingly.
      modified:
        mysql-test/r/func_compress.result
        mysql-test/r/max_allowed_packet_basic.result
        mysql-test/r/max_allowed_packet_func.result
        mysql-test/r/net_buffer_length_basic.result
        mysql-test/r/packet.result
        mysql-test/r/union.result
        mysql-test/r/variables.result
        mysql-test/t/func_compress.test
        mysql-test/t/innodb_bug34300.test
        mysql-test/t/max_allowed_packet_basic.test
        mysql-test/t/max_allowed_packet_func.test
        mysql-test/t/net_buffer_length_basic.test
        mysql-test/t/packet.test
        mysql-test/t/union.test
        mysql-test/t/variables.test
        sql/set_var.cc
        sql/set_var.h
        sql/share/errmsg.txt
      ------------------------------------------------------------
    ------------------------------------------------------------------------
  ------------------------------------------------------------------------

ChangeLog

-2008-11-26	The InnoDB Team
+2008-12-02	The InnoDB Team
 
-	* row/row0merge.c (row_merge_drop_temp_indexes):
+	* row/row0merge.c:
 	Replace the WHILE 1 with WHILE 1=1 in the SQL procedure, so that
 	the loop will actually be entered and temporary indexes be dropped
 	during crash recovery.
 
+2008-12-01	The InnoDB Team
+
+	InnoDB Plugin 1.0.2 released
+
 2008-10-31	The InnoDB Team
 
 	* dict/dict0mem.c, include/dict0mem.h, include/lock0lock.h,

handler/ha_innodb.cc

@@ -70,7 +70,6 @@ extern "C" {
 #include "ha_innodb.h"
 #include "i_s.h"
 #include "handler0vars.h"
-#include "mysql_addons.h"
 
 #ifndef MYSQL_SERVER
 /* This is needed because of Bug #3596.  Let us hope that pthread_mutex_t
@@ -549,7 +548,7 @@ innodb_srv_conc_exit_innodb(
 /*========================*/
 	trx_t*	trx)	/* in: transaction handle */
 {
-	if (UNIV_LIKELY(!srv_thread_concurrency)) {
+	if (UNIV_LIKELY(!trx->declared_to_be_inside_innodb)) {
 
 		return;
 	}
@@ -6901,11 +6900,13 @@ ha_innobase::info(
 			n_rows++;
 		}
 
-		/* Fix bug#29507: TRUNCATE shows too many rows affected.
-		Do not show the estimates for TRUNCATE command. */
+		/* Fix bug#40386: Not flushing query cache after truncate.
+		n_rows can not be 0 unless the table is empty, set to 1
+		instead. The original problem of bug#29507 is actually
+		fixed in the server code. */
 		if (thd_sql_command(user_thd) == SQLCOM_TRUNCATE) {
 
-			n_rows = 0;
+			n_rows = 1;
 
 			/* We need to reset the prebuilt value too, otherwise
 			checks for values greater than the last value written
@@ -7672,12 +7673,12 @@ ha_innobase::external_lock(
 	READ UNCOMMITTED and READ COMMITTED since the necessary
 	locks cannot be taken. In this case, we print an
 	informative error message and return with an error. */
-	if (lock_type == F_WRLCK && ib_bin_log_is_engaged(thd))
+	if (lock_type == F_WRLCK)
 	{
 		ulong const binlog_format= thd_binlog_format(thd);
 		ulong const tx_isolation = thd_tx_isolation(ha_thd());
-		if (tx_isolation <= ISO_READ_COMMITTED
-		    && binlog_format == BINLOG_FORMAT_STMT)
+		if (tx_isolation <= ISO_READ_COMMITTED &&
+		    binlog_format == BINLOG_FORMAT_STMT)
 		{
 			char buf[256];
 			my_snprintf(buf, sizeof(buf),

handler/mysql_addons.cc

@@ -23,29 +23,3 @@ Created November 07, 2007 Vasil Dimov
 
 #include "mysql_addons.h"
 #include "univ.i"
-
-/***********************************************************************
-Retrieve THD::thread_id
-http://bugs.mysql.com/30930 */
-extern "C" UNIV_INTERN
-unsigned long
-ib_thd_get_thread_id(
-/*=================*/
-				/* out: THD::thread_id */
-	const void*	thd)	/* in: THD */
-{
-	return((unsigned long) ((THD*) thd)->thread_id);
-}
-
-/* http://bugs.mysql.com/40360 */
-/* http://lists.mysql.com/commits/57450 */
-/**
-  See if the binary log is engaged for a thread, i.e., open and
-  LOG_BIN is set.
-
-  @return @c true if the binlog is active, @c false otherwise.
-*/
-my_bool ib_bin_log_is_engaged(const MYSQL_THD thd)
-{
-  return mysql_bin_log.is_open() && (thd->options & OPTION_BIN_LOG);
-}

ibuf/ibuf0ibuf.c

@@ -3895,31 +3895,17 @@ ibuf_merge_or_delete_for_page(
 	ut_ad(!block || buf_block_get_space(block) == space);
 	ut_ad(!block || buf_block_get_page_no(block) == page_no);
 	ut_ad(!block || buf_block_get_zip_size(block) == zip_size);
+	ut_a(ut_is_2pow(zip_size));
 
-	if (srv_force_recovery >= SRV_FORCE_NO_IBUF_MERGE) {
-
-		return;
-	} else if (trx_sys_hdr_page(space, page_no)) {
+	if (srv_force_recovery >= SRV_FORCE_NO_IBUF_MERGE
+	    || trx_sys_hdr_page(space, page_no)
+	    || ibuf_fixed_addr_page(space, zip_size, page_no)
+	    || fsp_descr_page(zip_size, page_no)) {
 
-		return;
-	} else if (ibuf_fixed_addr_page(space, 0, page_no)
-		   || fsp_descr_page(0, page_no)) {
-
-		/* This assumes that the uncompressed page size
-		is a power-of-2 multiple of zip_size. */
 		return;
 	}
 
 	if (UNIV_LIKELY(update_ibuf_bitmap)) {
-
-		ut_a(ut_is_2pow(zip_size));
-
-		if (ibuf_fixed_addr_page(space, zip_size, page_no)
-		    || fsp_descr_page(zip_size, page_no)) {
-
-			return;
-		}
-
 		/* If the following returns FALSE, we get the counter
 		incremented, and must decrement it when we leave this
 		function. When the counter is > 0, that prevents tablespace
@@ -3956,11 +3942,6 @@ ibuf_merge_or_delete_for_page(
 			}
 			mtr_commit(&mtr);
 		}
-	} else if (block
-		   && (ibuf_fixed_addr_page(space, zip_size, page_no)
-		      || fsp_descr_page(zip_size, page_no))) {
-
-		return;
 	}
 
 	ibuf_enter();

include/mysql_addons.h

@@ -14,34 +14,3 @@ here. In a perfect world this file exists but is empty.
 
 Created November 07, 2007 Vasil Dimov
 *******************************************************/
-
-#include <my_global.h>  /* for my_bool */
-#include <mysql/plugin.h>  /* for MYSQL_THD */
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/***********************************************************************
-Retrieve THD::thread_id
-http://bugs.mysql.com/30930 */
-
-unsigned long
-ib_thd_get_thread_id(
-/*=================*/
-				/* out: THD::thread_id */
-	const void*	thd);	/* in: THD */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-/* http://bugs.mysql.com/40360 */
-/* http://lists.mysql.com/commits/57450 */
-/**
-  See if the binary log is engaged for a thread, i.e., open and
-  LOG_BIN is set.
-
-  @return @c true if the binlog is active, @c false otherwise.
-*/
-my_bool ib_bin_log_is_engaged(const MYSQL_THD thd);

include/univ.i

@@ -11,7 +11,7 @@ Created 1/20/1994 Heikki Tuuri
 
 #define INNODB_VERSION_MAJOR	1
 #define INNODB_VERSION_MINOR	0
-#define INNODB_VERSION_BUGFIX	2
+#define INNODB_VERSION_BUGFIX	3
 
 /* The following is the InnoDB version as shown in
 SELECT plugin_version FROM information_schema.plugins;

mysql-test/innodb_bug34300.test

@@ -8,7 +8,9 @@
 -- disable_query_log
 -- disable_result_log
 
-SET @@max_allowed_packet=16777216;
+# set packet size and reconnect 
+SET @@global.max_allowed_packet=16777216;
+--connect (newconn, localhost, root,,)
 
 DROP TABLE IF EXISTS bug34300;
 CREATE TABLE bug34300 (

page/page0cur.c

@@ -907,7 +907,7 @@ page_cur_insert_rec_low(
 	ulint*		offsets,/* in/out: rec_get_offsets(rec, index) */
 	mtr_t*		mtr)	/* in: mini-transaction handle, or NULL */
 {
-	byte*		insert_buf	= NULL;
+	byte*		insert_buf;
 	ulint		rec_size;
 	page_t*		page;		/* the relevant page */
 	rec_t*		last_insert;	/* cursor position at previous
@@ -1172,7 +1172,7 @@ page_cur_insert_rec_zip(
 	ulint*		offsets,/* in/out: rec_get_offsets(rec, index) */
 	mtr_t*		mtr)	/* in: mini-transaction handle, or NULL */
 {
-	byte*		insert_buf	= NULL;
+	byte*		insert_buf;
 	ulint		rec_size;
 	page_t*		page;		/* the relevant page */
 	rec_t*		last_insert;	/* cursor position at previous
@@ -1285,6 +1285,41 @@ page_cur_insert_rec_zip(
 				    rec_get_next_ptr(free_rec, TRUE),
 				    rec_size);
 
+		if (page_is_leaf(page) && dict_index_is_clust(index)) {
+			/* Zero out the DB_TRX_ID and DB_ROLL_PTR
+			columns of free_rec, in case it will not be
+			overwritten by insert_rec. */
+
+			ulint	trx_id_col;
+			ulint	trx_id_offs;
+			ulint	len;
+
+			trx_id_col = dict_index_get_sys_col_pos(index,
+								DATA_TRX_ID);
+			ut_ad(trx_id_col > 0);
+			ut_ad(trx_id_col != ULINT_UNDEFINED);
+
+			trx_id_offs = rec_get_nth_field_offs(foffsets,
+							     trx_id_col, &len);
+			ut_ad(len == DATA_TRX_ID_LEN);
+
+			if (DATA_TRX_ID_LEN + DATA_ROLL_PTR_LEN + trx_id_offs
+			    + rec_offs_extra_size(foffsets) > rec_size) {
+				/* We will have to zero out the
+				DB_TRX_ID and DB_ROLL_PTR, because
+				they will not be fully overwritten by
+				insert_rec. */
+
+				memset(free_rec + trx_id_offs, 0,
+				       DATA_TRX_ID_LEN + DATA_ROLL_PTR_LEN);
+			}
+
+			ut_ad(free_rec + trx_id_offs + DATA_TRX_ID_LEN
+			      == rec_get_nth_field(free_rec, foffsets,
+						   trx_id_col + 1, &len));
+			ut_ad(len == DATA_ROLL_PTR_LEN);
+		}
+
 		if (UNIV_LIKELY_NULL(heap)) {
 			mem_heap_free(heap);
 		}

row/row0mysql.c

@@ -361,7 +361,7 @@ row_mysql_store_col_in_innobase_format(
 		/* In some cases we strip trailing spaces from UTF-8 and other
 		multibyte charsets, from FIXED-length CHAR columns, to save
 		space. UTF-8 would otherwise normally use 3 * the string length
-		bytes to store a latin1 string! */
+		bytes to store an ASCII string! */
 
 		/* We assume that this CHAR field is encoded in a
 		variable-length character set where spaces have

row/row0purge.c

@@ -217,7 +217,7 @@ row_purge_remove_sec_if_poss_low_nonbuffered(
 	ibool			old_has = FALSE;
 	ulint			err;
 	mtr_t			mtr;
-	mtr_t*			mtr_vers;
+	mtr_t			mtr_vers;
 	enum row_search_result	search_result;
 
 	log_free_check();
@@ -262,21 +262,17 @@ row_purge_remove_sec_if_poss_low_nonbuffered(
 	which cannot be purged yet, requires its existence. If some requires,
 	we should do nothing. */
 
-	mtr_vers = mem_alloc(sizeof(mtr_t));
+	mtr_start(&mtr_vers);
 
-	mtr_start(mtr_vers);
-
-	success = row_purge_reposition_pcur(BTR_SEARCH_LEAF, node, mtr_vers);
+	success = row_purge_reposition_pcur(BTR_SEARCH_LEAF, node, &mtr_vers);
 
 	if (success) {
 		old_has = row_vers_old_has_index_entry(
 			TRUE, btr_pcur_get_rec(&(node->pcur)),
-			mtr_vers, index, entry);
+			&mtr_vers, index, entry);
 	}
 
-	btr_pcur_commit_specify_mtr(&(node->pcur), mtr_vers);
-
-	mem_free(mtr_vers);
+	btr_pcur_commit_specify_mtr(&(node->pcur), &mtr_vers);
 
 	if (!old_has) {
 		/* Remove the index record */

row/row0umod.c

@@ -315,33 +315,16 @@ row_undo_mod_del_mark_or_remove_sec_low(
 					       &pcur, &mtr);
 
 	switch (UNIV_EXPECT(search_result, ROW_FOUND)) {
-		trx_t*	trx;
 	case ROW_NOT_FOUND:
 		/* In crash recovery, the secondary index record may
 		be missing if the UPDATE did not have time to insert
 		the secondary index records before the crash.  When we
 		are undoing that UPDATE in crash recovery, the record
-		may be missing.  In normal processing, the record
-		SHOULD exist. */
-
-		trx = thr_get_trx(thr);
-
-		if (!trx_is_recv(trx)) {
-			fputs("InnoDB: error in sec index entry del undo in\n"
-			      "InnoDB: ", stderr);
-			dict_index_name_print(stderr, trx, index);
-			fputs("\n"
-			      "InnoDB: tuple ", stderr);
-			dtuple_print(stderr, entry);
-			fputs("\n"
-			      "InnoDB: record ", stderr);
-			rec_print(stderr, btr_pcur_get_rec(&pcur), index);
-			putc('\n', stderr);
-			trx_print(stderr, trx, 0);
-			fputs("\n"
-			      "InnoDB: Submit a detailed bug report"
-			      " to http://bugs.mysql.com\n", stderr);
-		}
+		may be missing.
+
+		In normal processing, if an update ends in a deadlock
+		before it has inserted all updated secondary index
+		records, then the undo will not find those records. */
 
 		err = DB_SUCCESS;
 		goto func_exit;

srv/srv0srv.c

@@ -256,10 +256,10 @@ UNIV_INTERN ulong	srv_commit_concurrency	= 0;
 
 /* this mutex protects srv_conc data structures */
 UNIV_INTERN os_fast_mutex_t	srv_conc_mutex;
-/* number of OS threads currently inside InnoDB; it is not an error if
-this drops temporarily below zero because we do not demand that every
-thread increments this, but a thread waiting for a lock decrements
-this temporarily */
+/* number of transactions that have declared_to_be_inside_innodb set.
+It used to be a non-error for this value to drop below zero temporarily.
+This is no longer true. We'll, however, keep the lint datatype to add
+assertions to catch any corner cases that we may have missed. */
 UNIV_INTERN lint	srv_conc_n_threads	= 0;
 /* number of OS threads waiting in the FIFO for a permission to enter
 InnoDB */
@@ -999,6 +999,8 @@ srv_conc_enter_innodb(
 		return;
 	}
 
+	ut_ad(srv_conc_n_threads >= 0);
+
 	if (srv_conc_n_threads < (lint)srv_thread_concurrency) {
 
 		srv_conc_n_threads++;
@@ -1125,6 +1127,8 @@ srv_conc_force_enter_innodb(
 		return;
 	}
 
+	ut_ad(srv_conc_n_threads >= 0);
+
 	os_fast_mutex_lock(&srv_conc_mutex);
 
 	srv_conc_n_threads++;
@@ -1146,11 +1150,6 @@ srv_conc_force_exit_innodb(
 {
 	srv_conc_slot_t*	slot	= NULL;
 
-	if (UNIV_LIKELY(!srv_thread_concurrency)) {
-
-		return;
-	}
-
 	if (trx->mysql_thd != NULL
 	    && thd_is_replication_slave_thread(trx->mysql_thd)) {
 
@@ -1164,6 +1163,7 @@ srv_conc_force_exit_innodb(
 
 	os_fast_mutex_lock(&srv_conc_mutex);
 
+	ut_ad(srv_conc_n_threads > 0);
 	srv_conc_n_threads--;
 	trx->declared_to_be_inside_innodb = FALSE;
 	trx->n_tickets_to_enter_innodb = 0;

trx/trx0i_s.c

@@ -393,7 +393,7 @@ fill_trx_row(
 
 	if (trx->mysql_thd != NULL) {
 		row->trx_mysql_thread_id
-			= ib_thd_get_thread_id(trx->mysql_thd);
+			= thd_get_thread_id(trx->mysql_thd);
 	} else {
 		/* For internal transactions e.g., purge and transactions
 		being recovered at startup there is no associated MySQL

trx/trx0trx.c

@@ -250,6 +250,10 @@ trx_free(
 		      "InnoDB: inside InnoDB.\n", stderr);
 		trx_print(stderr, trx, 600);
 		putc('\n', stderr);
+
+		/* This is an error but not a fatal error. We must keep
+		the counters like srv_conc_n_threads accurate. */
+		srv_conc_force_exit_innodb(trx);
 	}
 
 	if (trx->n_mysql_tables_in_use != 0

trx/trx0undo.c

@@ -427,7 +427,7 @@ trx_undo_seg_create(
 	if (slot_no == ULINT_UNDEFINED) {
 		ut_print_timestamp(stderr);
 		fprintf(stderr,
-			"InnoDB: Warning: cannot find a free slot for"
+			"  InnoDB: Warning: cannot find a free slot for"
 			" an undo log. Do you have too\n"
 			"InnoDB: many active transactions"
 			" running concurrently?\n");

win-plugin/win-plugin.diff

@@ -37,7 +37,7 @@ diff -Nur sql/CMakeLists.txt.orig sql/CMakeLists.txt
 diff -Nur sql/mysqld.def.orig sql/mysqld.def
 --- sql/mysqld.def.orig	1969-12-31 18:00:00 -06:00
 +++ sql/mysqld.def	2008-10-31 02:20:32 -05:00
-@@ -0,0 +1,99 @@
+@@ -0,0 +1,98 @@
 +EXPORTS
 +	?use_hidden_primary_key@handler@@UAEXXZ
 +	?get_dynamic_partition_info@handler@@UAEXPAUPARTITION_INFO@@I@Z
@@ -82,11 +82,10 @@ diff -Nur sql/mysqld.def.orig sql/mysqld.def
 +	?THR_THD@@3PAVTHD@@A
 +	?end_of_list@@3Ulist_node@@A
 +	?mysql_tmpdir_list@@3Ust_my_tmpdir@@A
-+	?mysql_bin_log@@3VMYSQL_BIN_LOG@@A
-+	?is_open@MYSQL_LOG@@QAE_NXZ
 +	mysql_query_cache_invalidate4
 +	thd_query
 +	thd_sql_command
++	thd_get_thread_id
 +	thd_get_xid
 +	thd_slave_thread
 +	thd_non_transactional_update
@@ -141,7 +140,7 @@ diff -Nur sql/mysqld.def.orig sql/mysqld.def
 diff -Nur sql/mysqld_x64.def.orig sql/mysqld_x64.def
 --- sql/mysqld_x64.def.orig	1969-12-31 18:00:00 -06:00
 +++ sql/mysqld_x64.def		2008-10-31 02:22:04 -05:00
-@@ -0,0 +1,99 @@
+@@ -0,0 +1,98 @@
 +EXPORTS
 +	?use_hidden_primary_key@handler@@UEAAXXZ
 +	?get_dynamic_partition_info@handler@@UEAAXPEAUPARTITION_INFO@@I@Z
@@ -186,11 +185,10 @@ diff -Nur sql/mysqld_x64.def.orig sql/mysqld_x64.def
 +	?THR_THD@@3PEAVTHD@@EA
 +	?end_of_list@@3Ulist_node@@A
 +	?mysql_tmpdir_list@@3Ust_my_tmpdir@@A
-+	?mysql_bin_log@@3VMYSQL_BIN_LOG@@A
-+	?is_open@MYSQL_LOG@@QEAA_NXZ
 +	mysql_query_cache_invalidate4
 +	thd_query
 +	thd_sql_command
++	thd_get_thread_id
 +	thd_get_xid
 +	thd_slave_thread
 +	thd_non_transactional_update