diff options
| author | unknown <jimw@mysql.com> | 2005-08-15 14:19:56 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-15 14:19:56 -0700 |
| commit | c78623fa10bfb8d0716c2a77a85be651fdd33996 (patch) | |
| tree | 8d492e044b4d2e12a3864afbefc6052476ce23f3 /mysql-test/r/func_date_add.result | |
| parent | d6a6a48861705efc74a30c64e0cb577402c4cfef (diff) | |
| download | mariadb-git-c78623fa10bfb8d0716c2a77a85be651fdd33996.tar.gz | |
Clean up merge from 4.1
mysql-test/r/func_date_add.result:
Update results
mysql-test/r/func_time.result:
Update results
server-tools/instance-manager/protocol.cc:
Fix call to list_rest()
sql/sp_head.cc:
sp_change_db() removed, call mysql_change_db() instead.
Diffstat (limited to 'mysql-test/r/func_date_add.result')
| -rw-r--r-- | mysql-test/r/func_date_add.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/func_date_add.result b/mysql-test/r/func_date_add.result index 15ec80426ea..841d13a6ea6 100644 --- a/mysql-test/r/func_date_add.result +++ b/mysql-test/r/func_date_add.result @@ -56,10 +56,10 @@ insert into t1 values (date_add('2000-01-04', INTERVAL NULL DAY)); set sql_mode=''; insert into t1 (d) select date_sub('2000-01-01', INTERVAL 2001 YEAR); Warnings: -Warning 1437 Datetime function: datetime field overflow +Warning 1441 Datetime function: datetime field overflow insert into t1 (d) select date_add('2000-01-01',interval 8000 year); Warnings: -Warning 1437 Datetime function: datetime field overflow +Warning 1441 Datetime function: datetime field overflow insert into t1 values (date_add(NULL, INTERVAL 1 DAY)); insert into t1 values (date_add('2000-01-04', INTERVAL NULL DAY)); select * from t1; |