diff options
| author | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-03-02 15:09:20 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-03-02 15:09:20 +0400 |
| commit | 7fc2a2a765f976bd0ee7a5c965d33b429aba1a52 (patch) | |
| tree | dbf271dc1c2d6a7c704830eba3f2186a0d28bacb /mysql-test/r/func_sapdb.result | |
| parent | b4005afb85e53e2f9922fb94dbce8a8d14f0be48 (diff) | |
| parent | 33b6bab87177851b134da6b0c0596fdba2a906e8 (diff) | |
| download | mariadb-git-7fc2a2a765f976bd0ee7a5c965d33b429aba1a52.tar.gz | |
Merge mysql.com:/home/ram/work/b23616/b23616.4.1
into mysql.com:/home/ram/work/b23616/b23616.5.0
mysql-test/r/func_sapdb.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql-common/my_time.c:
Auto merged
Diffstat (limited to 'mysql-test/r/func_sapdb.result')
| -rw-r--r-- | mysql-test/r/func_sapdb.result | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mysql-test/r/func_sapdb.result b/mysql-test/r/func_sapdb.result index 18908c2c46e..4a6ec9a7ba0 100644 --- a/mysql-test/r/func_sapdb.result +++ b/mysql-test/r/func_sapdb.result @@ -240,9 +240,7 @@ a 10000 select microsecond(19971231235959.01) as a; a -0 -Warnings: -Warning 1292 Truncated incorrect time value: '19971231235959.01' +10000 select date_add("1997-12-31",INTERVAL "10.09" SECOND_MICROSECOND) as a; a 1997-12-31 00:00:10.090000 |