merging

3e02f955 · Alexey Botchkov · 1199dfcb · 3e02f955
Commit 3e02f955 authored Nov 18, 2008 by Alexey Botchkov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mysql-test/r/type_newdecimal.result mysql-test/r/type_newdecimal.result +1 -1

No files found.
--- a/mysql-test/r/type_newdecimal.result
+++ b/mysql-test/r/type_newdecimal.result
@@ -1543,7 +1543,7 @@ Note	1265	Data truncated for column '5.05 / 0.014' at row 1
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `5.05 / 0.014` decimal(10,6) default NULL
+  `5.05 / 0.014` decimal(10,6) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t1;
 5.05 / 0.014