summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqltest.result
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.blaudden>2007-04-10 13:51:32 +0200
committerunknown <msvensson@pilot.blaudden>2007-04-10 13:51:32 +0200
commit8163d5ec6eca4c11e2830f0240c54a7f2533b3b7 (patch)
tree60b1ba59e7e9322185c0a2d1201b6f222051a78a /mysql-test/r/mysqltest.result
parent390a0ede48b42ee41fd26f21dfed088b98dff396 (diff)
parente3e600bcf13d7ccda16c1cf45367346649eb5183 (diff)
downloadmariadb-git-8163d5ec6eca4c11e2830f0240c54a7f2533b3b7.tar.gz
Merge 192.168.0.4:mysql/mysql-4.1-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint client/mysqltest.c: Auto merged mysql-test/r/mysqltest.result: Auto merged mysql-test/t/mysqltest.test: Auto merged
Diffstat (limited to 'mysql-test/r/mysqltest.result')
-rw-r--r--mysql-test/r/mysqltest.result16
1 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index ba37284e597..51ca5e2a813 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -530,4 +530,20 @@ hello
hello
mysqltest: At line 1: test of die
Some output
+create table t1( a int, b char(255), c timestamp);
+insert into t1 values(1, 'Line 1', '2007-04-05'), (2, "Part 2", '2007-04-05');
+insert into t1 values(1, 'Line 1', '2007-04-05'), (2, "Part 3", '2007-04-05');
+select * from t1;
+a b c
+1 Line 1 2007-04-05 00:00:00
+2 Part 2 2007-04-05 00:00:00
+1 Line 1 2007-04-05 00:00:00
+2 Part 3 2007-04-05 00:00:00
+select * from t1;
+a b c
+1 Line 1 2007-04-05 00:00:00
+1 Line 1 2007-04-05 00:00:00
+2 Part 2 2007-04-05 00:00:00
+2 Part 3 2007-04-05 00:00:00
+select * from t1;
End of tests