diff options
| author | Sven Sandberg <sven@mysql.com> | 2008-07-06 19:07:30 +0200 |
|---|---|---|
| committer | Sven Sandberg <sven@mysql.com> | 2008-07-06 19:07:30 +0200 |
| commit | d9249cad45ab281e235b7c8b8f3fc89feef5c1d5 (patch) | |
| tree | 863c48cef3323705adc937eec09a0ba909568f00 /mysql-test/include/mix1.inc | |
| parent | 43e396c8d58035e98afd3942dc893766bd2a60dd (diff) | |
| parent | 2ed83dd95ff3e142c37cb098a39422205cd14b21 (diff) | |
| download | mariadb-git-d9249cad45ab281e235b7c8b8f3fc89feef5c1d5.tar.gz | |
Merge 5.1 -> 5.1-rpl
Diffstat (limited to 'mysql-test/include/mix1.inc')
| -rw-r--r-- | mysql-test/include/mix1.inc | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/mysql-test/include/mix1.inc b/mysql-test/include/mix1.inc index ab3c954d0e2..59c65f64c73 100644 --- a/mysql-test/include/mix1.inc +++ b/mysql-test/include/mix1.inc @@ -1429,29 +1429,31 @@ DROP TABLE t1; # Bug#21704: Renaming column does not update FK definition. # ---disable_warnings -DROP TABLE IF EXISTS t1; -DROP TABLE IF EXISTS t2; ---enable_warnings - -CREATE TABLE t1(id INT PRIMARY KEY) - ENGINE=innodb; - -CREATE TABLE t2( - t1_id INT PRIMARY KEY, - CONSTRAINT fk1 FOREIGN KEY (t1_id) REFERENCES t1(id)) - ENGINE=innodb; - ---echo - ---disable_result_log ---error ER_ERROR_ON_RENAME -ALTER TABLE t1 CHANGE id id2 INT; ---enable_result_log - ---echo - -DROP TABLE t2; -DROP TABLE t1; +# +# --disable_warnings +# DROP TABLE IF EXISTS t1; +# DROP TABLE IF EXISTS t2; +# --enable_warnings +# +# CREATE TABLE t1(id INT PRIMARY KEY) +# ENGINE=innodb; +# +# CREATE TABLE t2( +# t1_id INT PRIMARY KEY, +# CONSTRAINT fk1 FOREIGN KEY (t1_id) REFERENCES t1(id)) +# ENGINE=innodb; +# +# --echo +# +# --disable_result_log +# --error ER_ERROR_ON_RENAME +# ALTER TABLE t1 CHANGE id id2 INT; +# --enable_result_log +# +# --echo +# +# DROP TABLE t2; +# DROP TABLE t1; +# --echo End of 5.1 tests |