summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqldump.result
diff options
context:
space:
mode:
authorunknown <igreenhoe/greenman@anubis.greendragongames.com>2006-07-14 13:30:23 -0700
committerunknown <igreenhoe/greenman@anubis.greendragongames.com>2006-07-14 13:30:23 -0700
commit988f351e26a9767fe5861b20d5d200c2cb74c346 (patch)
treec5e50cf44ea78f9746f1422f5bdd7891e3db8aa7 /mysql-test/r/mysqldump.result
parent4c5d6c7b2af99f634fc2019e5028f8c5b795b970 (diff)
downloadmariadb-git-988f351e26a9767fe5861b20d5d200c2cb74c346.tar.gz
4.1 -> 5.0 merge
Diffstat (limited to 'mysql-test/r/mysqldump.result')
-rw-r--r--mysql-test/r/mysqldump.result5
1 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index 6803533eefa..118079906bf 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -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 */;