diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-05-07 16:12:42 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-05-07 16:12:42 +0500 |
| commit | 6e07c2e641303430c51098d1559dc28d31d4b578 (patch) | |
| tree | 1eb902b20bcaa743403f66b5240a9764c979f2ba /mysql-test/r/sp-vars.result | |
| parent | 42c714fd5f86a1dee317deb91f02994f97dffcef (diff) | |
| parent | 187ccf4bca5bf865fec86581d894fb8e6df0792a (diff) | |
| download | mariadb-git-6e07c2e641303430c51098d1559dc28d31d4b578.tar.gz | |
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/sp-vars.result:
merging
mysql-test/r/type_datetime.result:
SCCS merged
mysql-test/t/type_datetime.test:
SCCS merged
sql/item_func.h:
merging
sql/mysql_priv.h:
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 a9024156c6e..7d5b71cb67d 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" varbinary(19) DEFAULT NULL + "x" datetime default NULL ) CALL p1('test'); Table Create Table t1 CREATE TABLE "t1" ( - "x" varbinary(19) DEFAULT NULL + "x" datetime default NULL ) Warnings: Warning 1264 Out of range value for column 'x' at row 1 |