summaryrefslogtreecommitdiff
path: root/mysql-test/r/key.result
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2006-06-30 18:29:27 +0300
committerunknown <monty@mysql.com>2006-06-30 18:29:27 +0300
commit66a59b10e9494b807c96f4ddb476d674f0295fd9 (patch)
treeb32804ac8755f9a1db6113b996ee5dfda0e7a65f /mysql-test/r/key.result
parentc5ed64a416d3c9c658a22c9b20c4d36d31408d7e (diff)
downloadmariadb-git-66a59b10e9494b807c96f4ddb476d674f0295fd9.tar.gz
Reverted wrong bug fix (Bug#11228)
mysql-test/r/key.result: Fixed result after removing wrong bug fix mysql-test/t/key.test: Added SHOW CREATE TABLE, which is the proper way to check for table definitions sql/table.cc: Reverted wrong bug fix. The intention with the original code was to show that MySQL treats the first given unique key as a primary key. Clients can use the marked primary key as a real primary key to validate row changes in case of conflicting updates. The ODBC driver (and other drivers) may also use this fact to optimize/check updates and handle conflicts. The marked key also shows what some engines, like InnoDB or NDB, will use as it's internal primary key. For checking if someone has declared a true PRIMARY KEY, one should use 'SHOW CREATE TABLE'
Diffstat (limited to 'mysql-test/r/key.result')
-rw-r--r--mysql-test/r/key.result10
1 files changed, 9 insertions, 1 deletions
diff --git a/mysql-test/r/key.result b/mysql-test/r/key.result
index 0bc241c0d19..75fc469460e 100644
--- a/mysql-test/r/key.result
+++ b/mysql-test/r/key.result
@@ -332,8 +332,16 @@ UNIQUE i1idx (i1),
UNIQUE i2idx (i2));
desc t1;
Field Type Null Key Default Extra
-i1 int(11) UNI 0
+i1 int(11) PRI 0
i2 int(11) UNI 0
+show create table t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `i1` int(11) NOT NULL default '0',
+ `i2` int(11) NOT NULL default '0',
+ UNIQUE KEY `i1idx` (`i1`),
+ UNIQUE KEY `i2idx` (`i2`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
create table t1 (
c1 int,