summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_timestamp.result
diff options
context:
space:
mode:
authorsasha@mysql.sashanet.com <>2001-09-27 23:05:54 -0600
committersasha@mysql.sashanet.com <>2001-09-27 23:05:54 -0600
commitbb66c80aeba0e7ffeb4781d8570644b10479f9a6 (patch)
tree57e877bfc39c6dc5d9340ff9c84c6652d67724b0 /mysql-test/r/func_timestamp.result
parent043deed839271cf10bd3af31d2e109694952be0c (diff)
downloadmariadb-git-bb66c80aeba0e7ffeb4781d8570644b10479f9a6.tar.gz
client/mysqlmanagerc.c
added support for quiet increased line buffer size client/mysqltest.c fixed memory leak added query logging to result file added error message logging to result file added enable_query_log/disable_query_log mysql-test/mysql-test-run.sh converted tests to use mysqlmanager Updated test results
Diffstat (limited to 'mysql-test/r/func_timestamp.result')
-rw-r--r--mysql-test/r/func_timestamp.result8
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/func_timestamp.result b/mysql-test/r/func_timestamp.result
index 4d4a5b541ac..d9912f08b72 100644
--- a/mysql-test/r/func_timestamp.result
+++ b/mysql-test/r/func_timestamp.result
@@ -1,3 +1,11 @@
+drop table if exists t1;
+create table t1 (Zeit time, Tag tinyint not null, Monat tinyint not null,
+Jahr smallint not null, index(Tag), index(Monat), index(Jahr) );
+insert into t1 values ("09:26:00",16,9,1998),("09:26:00",16,9,1998);
+SELECT CONCAT(Jahr,'-',Monat,'-',Tag,' ',Zeit) AS Date,
+UNIX_TIMESTAMP(CONCAT(Jahr,'-',Monat,'-',Tag,' ',Zeit)) AS Unix
+FROM t1;
Date Unix
1998-9-16 09:26:00 905927160
1998-9-16 09:26:00 905927160
+drop table t1;