summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-01-30 06:41:37 +0100
committerunknown <serg@serg.mylan>2004-01-30 06:41:37 +0100
commitcfc362dbc5d3abdff6ea242836950803a8076542 (patch)
tree518b3af5db5f6a5a40ed154b51f5b5acc7e55217 /mysql-test/r
parente7a336d869830cd75581f5dc61bf79000d7050ae (diff)
parent832ea1206d74bba03cee2b7a9e88a622d8b7ac23 (diff)
downloadmariadb-git-cfc362dbc5d3abdff6ea242836950803a8076542.tar.gz
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/alter_table.result9
1 files changed, 6 insertions, 3 deletions
diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result
index 33af0b30d1c..ce324dc1fa8 100644
--- a/mysql-test/r/alter_table.result
+++ b/mysql-test/r/alter_table.result
@@ -412,12 +412,15 @@ t1 0 PRIMARY 1 Host A NULL NULL NULL BTREE
t1 0 PRIMARY 2 User A 0 NULL NULL BTREE
t1 1 Host 1 Host A NULL NULL NULL BTREE disabled
DROP TABLE t1;
-CREATE TABLE t1 (a int UNIQUE);
+CREATE TABLE t1 (a int PRIMARY KEY, b INT UNIQUE);
ALTER TABLE t1 DROP PRIMARY KEY;
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `a` int(11) default NULL,
- UNIQUE KEY `a` (`a`)
+ `a` int(11) NOT NULL default '0',
+ `b` int(11) default NULL,
+ UNIQUE KEY `b` (`b`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
+ALTER TABLE t1 DROP PRIMARY KEY;
+ERROR 42000: Can't DROP 'PRIMARY'. Check that column/key exists
DROP TABLE t1;