summaryrefslogtreecommitdiff
path: root/mysql-test/r/ps_2myisam.result
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-05-22 11:58:48 +0200
committerSergei Golubchik <sergii@pisem.net>2011-05-22 11:58:48 +0200
commit306ed65302e14f303fdc33cfa9d19016fb319440 (patch)
tree1419433c9d99e58fffee2527c42a8194c338a65e /mysql-test/r/ps_2myisam.result
parentdda9577d553c9969415bc5f3d45f287e3dd6de39 (diff)
downloadmariadb-git-306ed65302e14f303fdc33cfa9d19016fb319440.tar.gz
unix_timestamp() and from_unixtime() supports microseconds.
unix_timestamp() and time_to_sec() are hybrid items, returning integer or double depending on the argument.
Diffstat (limited to 'mysql-test/r/ps_2myisam.result')
-rw-r--r--mysql-test/r/ps_2myisam.result8
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/ps_2myisam.result b/mysql-test/r/ps_2myisam.result
index 6df671de88c..2fa07c5de6e 100644
--- a/mysql-test/r/ps_2myisam.result
+++ b/mysql-test/r/ps_2myisam.result
@@ -1793,8 +1793,8 @@ t5 CREATE TABLE `t5` (
`param08` longtext,
`const09` datetime DEFAULT NULL,
`param09` longblob,
- `const10` int(10) NOT NULL DEFAULT '0',
- `param10` bigint(20) DEFAULT NULL,
+ `const10` double NOT NULL DEFAULT '0',
+ `param10` double 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 3 10 9 N 32769 0 63
-def test t5 t5 param10 param10 8 20 9 Y 32768 0 63
+def test t5 t5 const10 const10 5 49 9 N 32769 31 63
+def test t5 t5 param10 param10 5 23 9 Y 32768 31 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