vasil e8e7816e5e branches/5.1: ...

Merge change from MySQL AB:

ChangeSet@1.2639, 2007-11-23 12:51:14+01:00, mkindahl@dl145h.mysql.com +7 -0
  Post-merge fixes.

  mysql-test/r/innodb.result@1.206, 2007-11-23 12:51:10+01:00, mkindahl@dl145h.mysql.com +1 -1
    Result change.

2008-01-04 15:38:59 +00:00

..

ctype_innodb_like.inc

Import 5.0 code.

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

have_innodb.inc

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

2007-07-31 05:56:17 +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-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

Merge a change from MySQL AB:

2007-03-27 05:45:32 +00:00

innodb-replace.test

Merge a change from MySQL AB:

2007-03-27 05:45:32 +00:00

innodb-semi-consistent-master.opt

Set an error code when a deadlock occurs in semi-consistent read. (Bug #31494)

2007-10-17 05:36:42 +00:00

innodb-semi-consistent.result

Set an error code when a deadlock occurs in semi-consistent read. (Bug #31494)

2007-10-17 05:36:42 +00:00

innodb-semi-consistent.test

Set an error code when a deadlock occurs in semi-consistent read. (Bug #31494)

2007-10-17 05:36:42 +00:00

innodb.result

branches/5.1:

2008-01-04 15:38:59 +00:00

innodb.test

branches/5.1:

2008-01-04 14:18:29 +00:00