diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2008-01-12 13:16:55 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2008-01-12 13:16:55 +0200 |
| commit | 978f3e3c3b2646a1f5328dffdb342c739a80b169 (patch) | |
| tree | 6a941607536091e967bfaf7487e16803c7826d95 /mysql-test | |
| parent | e689fbc4582de1b5f81cb69d98f5fe54b7064db1 (diff) | |
| download | mariadb-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')
| -rw-r--r-- | mysql-test/r/create.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/create.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/maria.test | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index 2a5b2e92bb2..73731ead70b 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -1717,7 +1717,7 @@ t1 CREATE TABLE `t1` ( `TIME` bigint(7) NOT NULL DEFAULT '0', `STATE` varchar(64) DEFAULT NULL, `INFO` longtext -) ENGINE=MARIA DEFAULT CHARSET=utf8 +) DEFAULT CHARSET=utf8 drop table t1; create temporary table t1 like information_schema.processlist; show create table t1; diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test index 60540e0066a..e491832ebac 100644 --- a/mysql-test/t/create.test +++ b/mysql-test/t/create.test @@ -1332,7 +1332,7 @@ drop function f1; # Bug#25629 CREATE TABLE LIKE does not work with INFORMATION_SCHEMA # create table t1 like information_schema.processlist; ---replace_result ENGINE=MyISAM "" ENGINE=Maria "" " PAGE_CHECKSUM=1" "" +--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" show create table t1; drop table t1; create temporary table t1 like information_schema.processlist; 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; |