mirror of
https://github.com/MariaDB/server.git
synced 2025-02-02 12:01:42 +01:00
8d57fae29c
c5419 because it is merge from branches/zip into branches/5.1
c5466 because the source code has been adjusted to match the MySQL
behavior and the innodb-autoinc test does not fail in branches/zip,
if c5466 is merged, then innodb-autoinc starts failing, Sunny suggested
not to merge c5466.
and resolving conflicts in c5410, c5440, c5488:
------------------------------------------------------------------------
r5410 | marko | 2009-06-24 22:26:34 +0300 (Wed, 24 Jun 2009) | 2 lines
Changed paths:
M /branches/5.1/include/trx0sys.ic
M /branches/5.1/trx/trx0purge.c
M /branches/5.1/trx/trx0sys.c
M /branches/5.1/trx/trx0undo.c
branches/5.1: Add missing #include "mtr0log.h" to avoid warnings
when compiling with -DUNIV_MUST_NOT_INLINE.
------------------------------------------------------------------------
r5419 | marko | 2009-06-25 16:11:57 +0300 (Thu, 25 Jun 2009) | 18 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb_bug42101-nonzero.result
M /branches/5.1/mysql-test/innodb_bug42101-nonzero.test
M /branches/5.1/mysql-test/innodb_bug42101.result
M /branches/5.1/mysql-test/innodb_bug42101.test
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.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5440 | vasil | 2009-06-30 13:04:29 +0300 (Tue, 30 Jun 2009) | 8 lines
Changed paths:
M /branches/5.1/fil/fil0fil.c
branches/5.1:
Fix Bug#45814 URL reference in InnoDB server errors needs adjusting to match documentation
by changing the URL from
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting.html to
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting-datadict.html
------------------------------------------------------------------------
r5466 | vasil | 2009-07-02 10:46:45 +0300 (Thu, 02 Jul 2009) | 6 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Adjust the failing innodb-autoinc test to conform to the latest behavior
of the MySQL code. The idea and the comment in innodb-autoinc.test come
from Sunny.
------------------------------------------------------------------------
r5488 | vasil | 2009-07-09 19:16:44 +0300 (Thu, 09 Jul 2009) | 13 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug21704.result
A /branches/5.1/mysql-test/innodb_bug21704.test
branches/5.1:
Fix Bug#21704 Renaming column does not update FK definition
by checking whether a column that participates in a FK definition is being
renamed and denying the ALTER in this case.
The patch was originally developed by Davi Arnaut <Davi.Arnaut@Sun.COM>:
http://lists.mysql.com/commits/77714
and was later adjusted to conform to InnoDB coding style by me (Vasil),
I also added some more comments and moved the bug specific mysql-test to
a separate file to make it more manageable and flexible.
------------------------------------------------------------------------
|
||
|---|---|---|
| .. | ||
| patches | ||
| ctype_innodb_like.inc | ||
| have_innodb.inc | ||
| innodb-analyze.result | ||
| innodb-analyze.test | ||
| innodb-autoinc.result | ||
| innodb-autoinc.test | ||
| innodb-index.inc | ||
| innodb-index.result | ||
| innodb-index.test | ||
| innodb-index_ucs2.result | ||
| innodb-index_ucs2.test | ||
| innodb-lock.result | ||
| innodb-lock.test | ||
| innodb-master.opt | ||
| innodb-replace.result | ||
| innodb-replace.test | ||
| innodb-semi-consistent-master.opt | ||
| innodb-semi-consistent.result | ||
| innodb-semi-consistent.test | ||
| innodb-timeout.result | ||
| innodb-timeout.test | ||
| innodb-use-sys-malloc-master.opt | ||
| innodb-use-sys-malloc.result | ||
| innodb-use-sys-malloc.test | ||
| innodb-zip.result | ||
| innodb-zip.test | ||
| innodb.result | ||
| innodb.test | ||
| innodb_bug21704.result | ||
| innodb_bug21704.test | ||
| innodb_bug34053.result | ||
| innodb_bug34053.test | ||
| innodb_bug34300.result | ||
| innodb_bug34300.test | ||
| innodb_bug35220.result | ||
| innodb_bug35220.test | ||
| innodb_bug36169.result | ||
| innodb_bug36169.test | ||
| innodb_bug36172.result | ||
| innodb_bug36172.test | ||
| innodb_bug40360.result | ||
| innodb_bug40360.test | ||
| innodb_bug40565.result | ||
| innodb_bug40565.test | ||
| innodb_bug41904.result | ||
| innodb_bug41904.test | ||
| innodb_bug42101-nonzero-master.opt | ||
| innodb_bug42101-nonzero.result | ||
| innodb_bug42101-nonzero.test | ||
| innodb_bug42101.result | ||
| innodb_bug42101.test | ||
| innodb_bug44032.result | ||
| innodb_bug44032.test | ||
| innodb_bug45357.result | ||
| innodb_bug45357.test | ||
| innodb_file_format.result | ||
| innodb_file_format.test | ||
| innodb_information_schema.result | ||
| innodb_information_schema.test | ||
| innodb_trx_weight.inc | ||
| innodb_trx_weight.result | ||
| innodb_trx_weight.test | ||