mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 19:41:47 +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.
------------------------------------------------------------------------
96 lines
2.6 KiB
Text
96 lines
2.6 KiB
Text
-- source include/have_innodb.inc
|
|
|
|
--echo #
|
|
--echo # Bug#21704: Renaming column does not update FK definition.
|
|
--echo #
|
|
|
|
--echo
|
|
--echo # Test that it's not possible to rename columns participating in a
|
|
--echo # foreign key (either in the referencing or referenced table).
|
|
--echo
|
|
|
|
--disable_warnings
|
|
DROP TABLE IF EXISTS t1;
|
|
DROP TABLE IF EXISTS t2;
|
|
DROP TABLE IF EXISTS t3;
|
|
--enable_warnings
|
|
|
|
CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ROW_FORMAT=COMPACT ENGINE=INNODB;
|
|
|
|
CREATE TABLE t2 (a INT PRIMARY KEY, b INT,
|
|
CONSTRAINT fk1 FOREIGN KEY (a) REFERENCES t1(a))
|
|
ROW_FORMAT=COMPACT ENGINE=INNODB;
|
|
|
|
CREATE TABLE t3 (a INT PRIMARY KEY, b INT, KEY(b), C INT,
|
|
CONSTRAINT fk2 FOREIGN KEY (b) REFERENCES t3 (a))
|
|
ROW_FORMAT=COMPACT ENGINE=INNODB;
|
|
|
|
INSERT INTO t1 VALUES (1,1),(2,2),(3,3);
|
|
INSERT INTO t2 VALUES (1,1),(2,2),(3,3);
|
|
INSERT INTO t3 VALUES (1,1,1),(2,2,2),(3,3,3);
|
|
|
|
--echo
|
|
--echo # Test renaming the column in the referenced table.
|
|
--echo
|
|
|
|
# mysqltest first does replace_regex, then replace_result
|
|
--replace_regex /'[^']*test\/#sql-[0-9a-f_]*'/'#sql-temporary'/
|
|
# Embedded server doesn't chdir to data directory
|
|
--replace_result $MYSQLTEST_VARDIR . mysqld.1/data/ ''
|
|
--error ER_ERROR_ON_RENAME
|
|
ALTER TABLE t1 CHANGE a c INT;
|
|
|
|
--echo # Ensure that online column rename works.
|
|
|
|
--enable_info
|
|
ALTER TABLE t1 CHANGE b c INT;
|
|
--disable_info
|
|
|
|
--echo
|
|
--echo # Test renaming the column in the referencing table
|
|
--echo
|
|
|
|
# mysqltest first does replace_regex, then replace_result
|
|
--replace_regex /'[^']*test\/#sql-[0-9a-f_]*'/'#sql-temporary'/
|
|
# Embedded server doesn't chdir to data directory
|
|
--replace_result $MYSQLTEST_VARDIR . mysqld.1/data/ ''
|
|
--error ER_ERROR_ON_RENAME
|
|
ALTER TABLE t2 CHANGE a c INT;
|
|
|
|
--echo # Ensure that online column rename works.
|
|
|
|
--enable_info
|
|
ALTER TABLE t2 CHANGE b c INT;
|
|
--disable_info
|
|
|
|
--echo
|
|
--echo # Test with self-referential constraints
|
|
--echo
|
|
|
|
# mysqltest first does replace_regex, then replace_result
|
|
--replace_regex /'[^']*test\/#sql-[0-9a-f_]*'/'#sql-temporary'/
|
|
# Embedded server doesn't chdir to data directory
|
|
--replace_result $MYSQLTEST_VARDIR . mysqld.1/data/ ''
|
|
--error ER_ERROR_ON_RENAME
|
|
ALTER TABLE t3 CHANGE a d INT;
|
|
|
|
# mysqltest first does replace_regex, then replace_result
|
|
--replace_regex /'[^']*test\/#sql-[0-9a-f_]*'/'#sql-temporary'/
|
|
# Embedded server doesn't chdir to data directory
|
|
--replace_result $MYSQLTEST_VARDIR . mysqld.1/data/ ''
|
|
--error ER_ERROR_ON_RENAME
|
|
ALTER TABLE t3 CHANGE b d INT;
|
|
|
|
--echo # Ensure that online column rename works.
|
|
|
|
--enable_info
|
|
ALTER TABLE t3 CHANGE c d INT;
|
|
--disable_info
|
|
|
|
--echo
|
|
--echo # Cleanup.
|
|
--echo
|
|
|
|
DROP TABLE t3;
|
|
DROP TABLE t2;
|
|
DROP TABLE t1;
|