From 207c0baf452dd962115fa6cfe5c50f535f46c8e7 Mon Sep 17 00:00:00 2001
From: "lars@mysql.com" <>
Date: Wed, 21 Jun 2006 15:30:26 +0200
Subject: [PATCH] After merge fix

---
 mysql-test/r/mysqldump.result | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index f9a30061642..bf43ad4eff1 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -3035,7 +3035,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_test_db` /*!40100 DEFAULT CH
 USE `mysqldump_test_db`;
 DROP TABLE IF EXISTS `t1`;
 CREATE TABLE `t1` (
-  `id` int(11) default NULL
+  `id` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;