summaryrefslogtreecommitdiff
path: root/mysql-test/t/maria.test
diff options
context:
space:
mode:
authorunknown <monty@mysql.com/narttu.mysql.fi>2008-01-12 13:16:55 +0200
committerunknown <monty@mysql.com/narttu.mysql.fi>2008-01-12 13:16:55 +0200
commit978f3e3c3b2646a1f5328dffdb342c739a80b169 (patch)
tree6a941607536091e967bfaf7487e16803c7826d95 /mysql-test/t/maria.test
parente689fbc4582de1b5f81cb69d98f5fe54b7064db1 (diff)
downloadmariadb-git-978f3e3c3b2646a1f5328dffdb342c739a80b169.tar.gz
Fixes to bugs and compiler warnings detected by pushbuild
Don't compare uuid's on maria_open() if table is not transactional Fixed that my_microtime() works on windows (patch added from 5.1) mysql-test/r/create.result: Portability fix mysql-test/t/create.test: Portability fix mysql-test/t/maria.test: Remove warnings, to make test portable to windows mysys/my_getsystime.c: Add missed merge from 5.1 This fixes that timing works on windows and fixes that that failed becasuse slow_query_log didn't get any queries storage/maria/ma_check.c: Removed not needed setting of variable storage/maria/ma_loghandler.c: Fixed compiler warnings storage/maria/ma_open.c: Don't compare uuid's if table is not transactional KNOWN_BUGS.txt: New BitKeeper file ``KNOWN_BUGS.txt''
Diffstat (limited to 'mysql-test/t/maria.test')
-rw-r--r--mysql-test/t/maria.test5
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/t/maria.test b/mysql-test/t/maria.test
index 9654b5c76ec..120f5178a4c 100644
--- a/mysql-test/t/maria.test
+++ b/mysql-test/t/maria.test
@@ -989,7 +989,9 @@ connect (session2,localhost,root,,);
connection session1;
disable_query_log;
+disable_warnings;
eval create temporary table t1 (a int) data directory="$MYSQLTEST_VARDIR/tmp" select 9 a;
+enable_warnings;
enable_query_log;
disable_result_log;
show create table t1;
@@ -997,7 +999,10 @@ enable_result_log;
connection session2;
disable_query_log;
+
+disable_warnings;
eval create temporary table t1 (a int) data directory="$MYSQLTEST_VARDIR/tmp" select 99 a;
+enable_warnings;
enable_query_log;
disable_result_log;
show create table t1;