merging fix

mysql-test/r/sp-vars.result: merging

merging fix
mysql-test/r/sp-vars.result: merging
59ae1777 · unknown · 6e07c2e6 · 59ae1777
Commit 59ae1777 authored May 07, 2007 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mysql-test/r/sp-vars.result mysql-test/r/sp-vars.result +2 -2

No files found.
--- a/mysql-test/r/sp-vars.result
+++ b/mysql-test/r/sp-vars.result
@@ -690,12 +690,12 @@ END|
 CALL p1(NOW());
 Table	Create Table
 t1	CREATE TABLE "t1" (
-  "x" datetime default NULL
+  "x" datetime DEFAULT NULL
 )
 CALL p1('test');
 Table	Create Table
 t1	CREATE TABLE "t1" (
-  "x" datetime default NULL
+  "x" datetime DEFAULT NULL
 )
 Warnings:
 Warning	1264	Out of range value for column 'x' at row 1