From 59ae1777e5e5e123baf57e497791a2c2596096da Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 7 May 2007 17:33:28 +0500 Subject: [PATCH] merging fix mysql-test/r/sp-vars.result: merging --- mysql-test/r/sp-vars.result | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/sp-vars.result b/mysql-test/r/sp-vars.result index 7d5b71cb67d..968bb75309b 100644 --- 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