diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-05-07 17:33:28 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-05-07 17:33:28 +0500 |
| commit | 59ae1777e5e5e123baf57e497791a2c2596096da (patch) | |
| tree | 250fb1646877a6626bc8f3f30dade4fb89529d93 /mysql-test/r/sp-vars.result | |
| parent | 6e07c2e641303430c51098d1559dc28d31d4b578 (diff) | |
| download | mariadb-git-59ae1777e5e5e123baf57e497791a2c2596096da.tar.gz | |
merging fix
mysql-test/r/sp-vars.result:
merging
Diffstat (limited to 'mysql-test/r/sp-vars.result')
| -rw-r--r-- | mysql-test/r/sp-vars.result | 4 |
1 files 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 |