summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorlars@mysql.com <>2006-06-21 15:30:26 +0200
committerlars@mysql.com <>2006-06-21 15:30:26 +0200
commit207c0baf452dd962115fa6cfe5c50f535f46c8e7 (patch)
tree8417c5ac2c39b798889af69a50dd0a985f23db4c /mysql-test
parent6b8c1965848f82d6c27d34bb9b2e01718f98e47c (diff)
downloadmariadb-git-207c0baf452dd962115fa6cfe5c50f535f46c8e7.tar.gz
After merge fix
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/mysqldump.result2
1 files changed, 1 insertions, 1 deletions
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;