maria-developers team mailing list archive

[Michael Widenius <monty@xxxxxxxxxxxx>]

#At lp:maria based on revid:monty@xxxxxxxxxxxx-20100407152630-br17spd9a30jvmx0

 2843 Michael Widenius	2010-04-08
      Fixed syntax error and some timeing issues in test suite
      modified:
        mysql-test/r/func_time.result
        mysql-test/t/func_time.test
        storage/maria/ma_loghandler.c

per-file messages:
  mysql-test/r/func_time.result
    Updated result
  mysql-test/t/func_time.test
    sysdate() could be same even with one sleep(1) in between.
  storage/maria/ma_loghandler.c
    Fixed syntax error
=== modified file 'mysql-test/r/func_time.result'
--- a/mysql-test/r/func_time.result	2010-01-21 08:10:05 +0000
+++ b/mysql-test/r/func_time.result	2010-04-08 09:47:31 +0000
@@ -1120,7 +1120,7 @@ drop function t_slow_sysdate;
 drop table t1;
 SET GLOBAL log_bin_trust_function_creators = 0;
 create table t1 (a datetime, i int, b datetime);
-insert into t1 select sysdate(), sleep(1), sysdate() from dual;
+insert into t1 select sysdate(), sleep(2), sysdate() from dual;
 select a != b from t1;
 a != b
 1

=== modified file 'mysql-test/t/func_time.test'
--- a/mysql-test/t/func_time.test	2009-01-23 12:22:05 +0000
+++ b/mysql-test/t/func_time.test	2010-04-08 09:47:31 +0000
@@ -650,7 +650,7 @@ drop table t1;
 SET GLOBAL log_bin_trust_function_creators = 0;
 
 create table t1 (a datetime, i int, b datetime);
-insert into t1 select sysdate(), sleep(1), sysdate() from dual;
+insert into t1 select sysdate(), sleep(2), sysdate() from dual;
 select a != b from t1;
 drop table t1;
 

=== modified file 'storage/maria/ma_loghandler.c'
--- a/storage/maria/ma_loghandler.c	2010-03-30 12:36:49 +0000
+++ b/storage/maria/ma_loghandler.c	2010-04-08 09:47:31 +0000
@@ -1211,9 +1211,10 @@ static my_bool translog_set_lsn_for_file
   for (file= from_file; file <= to_file; file++)
   {
     LOGHANDLER_FILE_INFO info;
+    File fd;
     LINT_INIT(info.max_lsn);
 
-    File fd= open_logfile_by_number_no_cache(file);
+    fd= open_logfile_by_number_no_cache(file);
     if ((fd < 0) ||
         ((translog_read_file_header(&info, fd) ||
           (cmp_translog_addr(lsn, info.max_lsn) > 0 &&