summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2011-05-28 16:57:58 +0200
committerVladislav Vaintroub <wlad@montyprogram.com>2011-05-28 16:57:58 +0200
commitb519f2b626ebd1f3243a21dc883cefa6a26460f9 (patch)
treefaad721ece99fc071000e695861e37d45acda0e5 /mysql-test/include
parent152dfe58678af35769ca3cd66db592d129b4c08b (diff)
downloadmariadb-git-b519f2b626ebd1f3243a21dc883cefa6a26460f9.tar.gz
Fix compile errors and warnings and test errors introduced by microseconds push.
Also, change windows timespec definition to be Unix-ish - simplifies handling a lot.
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/type_hrtime.inc1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/include/type_hrtime.inc b/mysql-test/include/type_hrtime.inc
index f9369d51658..7bde8c609e4 100644
--- a/mysql-test/include/type_hrtime.inc
+++ b/mysql-test/include/type_hrtime.inc
@@ -15,6 +15,7 @@ insert t1 values (20101211010203.45678);
insert t1 values (20101211030405.789e0);
insert t1 values (99991231235959e1);
select * from t1;
+--replace_regex /121000/121094/ /457000/457031/ /789000/789062/
select truncate(a, 6) from t1; # Field::val_real()
select a DIV 1 from t1; # Field::val_int()
select group_concat(distinct a) from t1; # Field::cmp()