~drizzle-trunk/drizzle/development

Merge Eric

added added

removed removed

DROP TABLE IF EXISTS t1;

CREATE TABLE t1(a int, key (a));

INSERT INTO t1 VALUES (1), (2);

SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;

SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;

DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (

`a` int DEFAULT NULL,

KEY `a` (`a`)

) ENGINE=InnoDB;

ALTER TABLE `t1` DISABLE KEYS;

INSERT INTO `t1` VALUES (1),(2);

ALTER TABLE `t1` ENABLE KEYS;

SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;

SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;

DROP TABLE t1;

drizzled is alive