merging fix
mysql-test/r/sp-vars.result: merging
This commit is contained in:
parent
6e07c2e641
commit
59ae1777e5
@ -690,12 +690,12 @@ END|
|
|||||||
CALL p1(NOW());
|
CALL p1(NOW());
|
||||||
Table Create Table
|
Table Create Table
|
||||||
t1 CREATE TABLE "t1" (
|
t1 CREATE TABLE "t1" (
|
||||||
"x" datetime default NULL
|
"x" datetime DEFAULT NULL
|
||||||
)
|
)
|
||||||
CALL p1('test');
|
CALL p1('test');
|
||||||
Table Create Table
|
Table Create Table
|
||||||
t1 CREATE TABLE "t1" (
|
t1 CREATE TABLE "t1" (
|
||||||
"x" datetime default NULL
|
"x" datetime DEFAULT NULL
|
||||||
)
|
)
|
||||||
Warnings:
|
Warnings:
|
||||||
Warning 1264 Out of range value for column 'x' at row 1
|
Warning 1264 Out of range value for column 'x' at row 1
|
||||||
|
Loading…
x
Reference in New Issue
Block a user