4.1 -> 5.0 merge

20de0388 · igreenhoe/greenman@anubis.greendragongames.com · 9beb95f0 · 20de0388
Commit 20de0388 authored Jul 14, 2006 by igreenhoe/greenman@anubis.greendragongames.com
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

mysql-test/r/mysqldump.result mysql-test/r/mysqldump.result +2 -3

No files found.
--- 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 */;