marko 274dd54952 branches/5.1: Merge r5418 from branches/zip: ...

------------------------------------------------------------------------
  r5418 | marko | 2009-06-25 15:55:52 +0300 (Thu, 25 Jun 2009) | 5 lines
  Changed paths:
     M /branches/zip/ChangeLog
     M /branches/zip/handler/ha_innodb.cc
     M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
     M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
     M /branches/zip/mysql-test/innodb_bug42101.result
     M /branches/zip/mysql-test/innodb_bug42101.test
  
  branches/zip: Fix a race condition caused by
  SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
  When innodb_commit_concurrency is initially set nonzero,
  DEFAULT would change it back to 0, triggering Bug #42101.
  rb://139 approved by Heikki Tuuri.
  ------------------------------------------------------------------------

2009-06-25 12:11:57 +00:00

..

ctype_innodb_like.inc

Import 5.0 code.

2005-10-27 07:29:40 +00:00

have_innodb.inc

branches/5.1:

2008-03-11 16:50:50 +00:00

innodb_bug34053.result

branches/5.1:

2008-02-07 12:02:06 +00:00

innodb_bug34053.test

branches/5.1:

2008-03-11 16:50:50 +00:00

innodb_bug34300.result

branches/5.1:

2008-03-26 16:26:54 +00:00

innodb_bug34300.test

branches/5.1:

2008-12-09 09:21:08 +00:00

innodb_bug35220.result

branches/5.1:

2008-03-18 07:35:30 +00:00

innodb_bug35220.test

branches/5.1:

2008-03-18 07:35:30 +00:00

innodb_bug38231.result

branches/5.1:

2008-10-01 06:13:13 +00:00

innodb_bug38231.test

branches/5.1:

2008-10-01 06:13:13 +00:00

innodb_bug39438-master.opt

branches/5.1:

2008-10-03 14:17:28 +00:00

innodb_bug39438.result

branches/5.1:

2008-10-03 14:17:28 +00:00

innodb_bug39438.test

branches/5.1:

2008-10-03 14:17:28 +00:00

innodb_bug40565.result

branches/5.1: Merge the test case from r5232 from branches/5.0:

2009-06-03 11:12:44 +00:00

innodb_bug40565.test

branches/5.1: Merge the test case from r5232 from branches/5.0:

2009-06-03 11:12:44 +00:00

innodb_bug42101-nonzero-master.opt

branches/5.1: Prevent a race condition in innobase_commit() by ensuring

2009-05-14 11:04:55 +00:00

innodb_bug42101-nonzero.result

branches/5.1: Merge r5418 from branches/zip:

2009-06-25 12:11:57 +00:00

innodb_bug42101-nonzero.test

branches/5.1: Merge r5418 from branches/zip:

2009-06-25 12:11:57 +00:00

innodb_bug42101.result

branches/5.1: Merge r5418 from branches/zip:

2009-06-25 12:11:57 +00:00

innodb_bug42101.test

branches/5.1: Merge r5418 from branches/zip:

2009-06-25 12:11:57 +00:00

innodb_bug45357.result

branches/5.1: row_unlock_for_mysql(): When the clustered index is unknown,

2009-06-17 08:11:49 +00:00

innodb_bug45357.test

branches/5.1: row_unlock_for_mysql(): When the clustered index is unknown,

2009-06-17 08:11:49 +00:00

innodb_trx_weight.inc

mysql-test/innodb_trx_weight.inc: Add username root to the "connect" statement.

2007-06-06 12:13:59 +00:00

innodb_trx_weight.result

Fix Bug#21293: Consider transactions that had edited non-transactional

2007-05-15 14:53:04 +00:00

innodb_trx_weight.test

Merge changes from MySQL AB, as of the following changeset:

2007-07-31 05:56:17 +00:00

innodb-autoinc.result

branches/5.1: The version of the result file checked in was broken in r5243.

2009-06-04 06:16:24 +00:00

innodb-autoinc.test

branches/5.1: When the InnoDB and MySQL data dictionaries go out of sync, before

2009-06-03 23:17:14 +00:00

innodb-lock.result

Import 5.0 code.

2005-10-27 07:29:40 +00:00

innodb-lock.test

Merge changes from MySQL AB to mysql-test directives.

2007-03-02 13:23:21 +00:00

innodb-master.opt

Make innodb_unsafe_binlog test case faster. Group all consistent read

2006-04-05 10:11:00 +00:00

innodb-replace.result

branches/5.1:

2008-07-01 06:37:34 +00:00

innodb-replace.test

branches/5.1:

2008-07-01 06:37:34 +00:00

innodb-semi-consistent-master.opt

branches/5.1: Make

2008-12-22 14:05:19 +00:00

innodb-semi-consistent.result

branches/5.1: row_sel_get_clust_rec_for_mysql(): Store the cursor position

2009-03-12 07:38:05 +00:00

innodb-semi-consistent.test

branches/5.1: row_sel_get_clust_rec_for_mysql(): Store the cursor position

2009-03-12 07:38:05 +00:00

innodb.result

branches/5.1:

2009-03-30 11:55:31 +00:00

innodb.test

branches/5.1:

2009-04-06 11:34:51 +00:00