Commit 1486a426 authored by unknown's avatar unknown
Browse files

4.1 -> 5.0 merge

parent 2e3ed9c1

mysql-test/r/mysqldump.result

+2 −3
Original line number Diff line number Diff line
@@ -2835,11 +2835,10 @@ CREATE TABLE `basetable` ( 
  UNIQUE KEY `id` (`id`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1;





/*!40000 ALTER TABLE `basetable` DISABLE KEYS */;

LOCK TABLES `basetable` WRITE;

UNLOCK TABLES;

/*!40000 ALTER TABLE `basetable` DISABLE KEYS */;

/*!40000 ALTER TABLE `basetable` ENABLE KEYS */;

UNLOCK TABLES;



CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_views` /*!40100 DEFAULT CHARACTER SET latin1 */;