diff options
| author | Satya B <satya.bn@sun.com> | 2009-07-10 17:05:53 +0530 |
|---|---|---|
| committer | Satya B <satya.bn@sun.com> | 2009-07-10 17:05:53 +0530 |
| commit | f5bec50697c34052b0d9dfe36c38821a6892e4cb (patch) | |
| tree | cb4c1d3bb8ad8fb438d0bf9e066f5cf87ebe2050 /mysql-test/include/mtr_warnings.sql | |
| parent | 6e03aa451ad149c51e8d121c16b25fea239c1ce8 (diff) | |
| download | mariadb-git-f5bec50697c34052b0d9dfe36c38821a6892e4cb.tar.gz | |
Applying InnoDB snapshot 5.1-ss5488,part 4. Fixes BUG#21704
1. BUG#21704 - Renaming column does not update FK definition
2. Changes in mysql-test/include/mtr_warnings.sql so that the testcase
for BUG#21704 doesn't fail because of the warnings generated.
Detailed revision comments:
r5488 | vasil | 2009-07-09 19:16:44 +0300 (Thu, 09 Jul 2009) | 13 lines
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.
Diffstat (limited to 'mysql-test/include/mtr_warnings.sql')
| -rw-r--r-- | mysql-test/include/mtr_warnings.sql | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql index 73287900f3c..b99402c8031 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql @@ -139,9 +139,9 @@ INSERT INTO global_suppressions VALUES ("Cannot find or open table test\/bug29807 from"), /* innodb foreign key tests that fail in ALTER or RENAME produce this */ - ("InnoDB: Error: in ALTER TABLE `test`.`t[12]`"), + ("InnoDB: Error: in ALTER TABLE `test`.`t[123]`"), ("InnoDB: Error: in RENAME TABLE table `test`.`t1`"), - ("InnoDB: Error: table `test`.`t[12]` does not exist in the InnoDB internal"), + ("InnoDB: Error: table `test`.`t[123]` does not exist in the InnoDB internal"), /* Test case for Bug#14233 produces the following warnings: */ ("Stored routine 'test'.'bug14233_1': invalid value in column mysql.proc"), |