diff options
| author | unknown <kaa@polly.local> | 2006-10-12 11:21:52 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2006-10-12 11:21:52 +0400 |
| commit | 45af97ad1d06f1ef66d9f4dad53b6cc255e781a2 (patch) | |
| tree | b750e04bb88aa67205a02253dccd5b9197b5ab56 /mysql-test/r | |
| parent | 186b831244239149520d0742c3a5947f36c75218 (diff) | |
| parent | 62e102b42eb286c5fc4f5ed2e11357a08c930069 (diff) | |
| download | mariadb-git-45af97ad1d06f1ef66d9f4dad53b6cc255e781a2.tar.gz | |
Merge polly.local:/tmp/maint/bug11655/my50-bug11655
into polly.local:/tmp/maint/bug11655/my51-bug11655
mysql-test/r/func_time.result:
Auto merged
sql/item_timefunc.cc:
Auto merged
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/func_time.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index b1e20d474f8..8a805c80595 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -970,7 +970,7 @@ CREATE TABLE t1(f1 TIME); INSERT INTO t1 VALUES('916:00:00 a'); Warnings: Warning 1265 Data truncated for column 'f1' at row 1 -Warning 1264 Data truncated; out of range for column 'f1' at row 1 +Warning 1264 Out of range value adjusted for column 'f1' at row 1 SELECT * FROM t1; f1 838:59:59 |