merging fix

mysql-test/r/sp-vars.result:
  merging
This commit is contained in:
unknown 2007-05-07 17:33:28 +05:00
parent 6e07c2e641
commit 59ae1777e5

View File

@ -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