summaryrefslogtreecommitdiff
path: root/mysql-test/r/type_timestamp_hires.result
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-11-03 19:17:05 +0100
committerSergei Golubchik <sergii@pisem.net>2011-11-03 19:17:05 +0100
commit0e007344eae972b9be7d88ca43373cb33662ac1c (patch)
tree7b3561cb3ea2ad24d013e847680ec165f406387e /mysql-test/r/type_timestamp_hires.result
parent3794110f0215f0631107c2694dc0f1675a4bb520 (diff)
parent681476255147dacac7e3674b6cd2ae770fee2208 (diff)
downloadmariadb-git-0e007344eae972b9be7d88ca43373cb33662ac1c.tar.gz
mysql-5.5.18 merge
Diffstat (limited to 'mysql-test/r/type_timestamp_hires.result')
-rw-r--r--mysql-test/r/type_timestamp_hires.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/type_timestamp_hires.result b/mysql-test/r/type_timestamp_hires.result
index f5009cd2342..3f1e05f4870 100644
--- a/mysql-test/r/type_timestamp_hires.result
+++ b/mysql-test/r/type_timestamp_hires.result
@@ -28,7 +28,7 @@ a DIV 1
0
20101211002003
20101211010203
-20101211030406
+20101211030405
20101211154711
select group_concat(distinct a) from t1;
group_concat(distinct a)