diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-25 13:56:50 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-25 13:56:50 +0300 |
| commit | 3ba6a2a9fa3fc7eed89ec612eb4f4ed6645bcd7d (patch) | |
| tree | d33ce0a47fbf5181f9c5ebfeddb7830a2e9f7223 /mysql-test/r/alter_table.result | |
| parent | 4c61db988714676e71175fbbf20173b9a96d06c2 (diff) | |
| parent | 916b559b10d06574ac77ab549785726ba2878222 (diff) | |
| download | mariadb-git-3ba6a2a9fa3fc7eed89ec612eb4f4ed6645bcd7d.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:
mysql-test/collections/default.experimental
Diffstat (limited to 'mysql-test/r/alter_table.result')
| -rw-r--r-- | mysql-test/r/alter_table.result | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result index 15171798279..db80e9d2eea 100644 --- a/mysql-test/r/alter_table.result +++ b/mysql-test/r/alter_table.result @@ -1338,6 +1338,13 @@ ALTER TABLE t1 CHANGE COLUMN f1 f1_no_real_change TIMESTAMP NULL DEFAULT NULL; affected rows: 0 info: Records: 0 Duplicates: 0 Warnings: 0 DROP TABLE t1; +# +# Bug #31145: ALTER TABLE DROP COLUMN, ADD COLUMN crashes (linux) +# or freezes (win) the server +# +CREATE TABLE t1 (a TEXT, id INT, b INT); +ALTER TABLE t1 DROP COLUMN a, ADD COLUMN c TEXT FIRST; +DROP TABLE t1; End of 5.1 tests CREATE TABLE t1(c CHAR(10), i INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY); |