Skip to content

M
MariaDB
Commit 218af4b7 authored by unknown's avatar unknown
Browse files
Options

merging fix 


mysql-test/r/sp-vars.result:
  merging
parent 50f573dc
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
mysql-test/r/sp-vars.result
View file @ 218af4b7
...@@ -690,12 +690,12 @@ END| ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7