summaryrefslogtreecommitdiff
path: root/mysql-test/suite
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mnogosearch.org>2013-09-12 21:31:14 +0400
committerAlexander Barkov <bar@mnogosearch.org>2013-09-12 21:31:14 +0400
commit499ddea5766d988adc858448c8eec549c7bedcc1 (patch)
treefd0a976fc3ac2b96c8f812c1bab2e0e57976cfce /mysql-test/suite
parentc2b38529a9ca2ea09dfa73186d9350a0d6dcd6ac (diff)
downloadmariadb-git-499ddea5766d988adc858448c8eec549c7bedcc1.tar.gz
MDEV-4724 Some temporal functions do not preserve microseconds
Diffstat (limited to 'mysql-test/suite')
-rw-r--r--mysql-test/suite/maria/r/ps_maria.result12
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/suite/maria/r/ps_maria.result b/mysql-test/suite/maria/r/ps_maria.result
index 3546e78512c..207ae8a59db 100644
--- a/mysql-test/suite/maria/r/ps_maria.result
+++ b/mysql-test/suite/maria/r/ps_maria.result
@@ -1793,8 +1793,8 @@ t5 CREATE TABLE `t5` (
`param08` longtext,
`const09` datetime DEFAULT NULL,
`param09` longblob,
- `const10` decimal(22,6) DEFAULT NULL,
- `param10` decimal(65,30) DEFAULT NULL,
+ `const10` bigint(17) DEFAULT NULL,
+ `param10` bigint(20) DEFAULT NULL,
`const11` int(4) DEFAULT NULL,
`param11` bigint(20) DEFAULT NULL,
`const12` binary(0) DEFAULT NULL,
@@ -1823,8 +1823,8 @@ def test t5 t5 const08 const08 253 19 19 N 1 0 8
def test t5 t5 param08 param08 252 4294967295 19 Y 16 0 8
def test t5 t5 const09 const09 12 19 19 Y 128 0 63
def test t5 t5 param09 param09 252 4294967295 19 Y 144 0 63
-def test t5 t5 const10 const10 246 24 16 Y 0 6 63
-def test t5 t5 param10 param10 246 67 40 Y 0 30 63
+def test t5 t5 const10 const10 8 17 9 Y 32768 0 63
+def test t5 t5 param10 param10 8 20 9 Y 32768 0 63
def test t5 t5 const11 const11 3 4 4 Y 32768 0 63
def test t5 t5 param11 param11 8 20 4 Y 32768 0 63
def test t5 t5 const12 const12 254 0 0 Y 128 0 63
@@ -1850,8 +1850,8 @@ const08 1991-08-05 01:01:01
param08 1991-08-05 01:01:01
const09 1991-08-05 01:01:01
param09 1991-08-05 01:01:01
-const10 662680861.000000
-param10 662680861.000000000000000000000000000000
+const10 662680861
+param10 662680861
const11 1991
param11 1991
const12 NULL