diff options
| author | igreenhoe/greenman@anubis.greendragongames.com <> | 2006-07-14 13:30:23 -0700 |
|---|---|---|
| committer | igreenhoe/greenman@anubis.greendragongames.com <> | 2006-07-14 13:30:23 -0700 |
| commit | 20de0388878e7b168172f25813e50cabb7255324 (patch) | |
| tree | c5e50cf44ea78f9746f1422f5bdd7891e3db8aa7 /mysql-test | |
| parent | 9beb95f0ed5fae454554c0b13ae0eb89cadc8237 (diff) | |
| download | mariadb-git-20de0388878e7b168172f25813e50cabb7255324.tar.gz | |
4.1 -> 5.0 merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/mysqldump.result | 5 |
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 */; |