database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fixed syntax error and some timeing issues in test suite

Browse Source 
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
This commit is contained in:
Michael Widenius
2010-04-08 12:47:31 +03:00
parent b34262264a
commit 04ff96f789
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/func_time.result
View File

@@ -1120,7 +1120,7 @@ drop function t_slow_sysdate;
drop table t1; drop table t1;
SET GLOBAL log_bin_trust_function_creators = 0; SET GLOBAL log_bin_trust_function_creators = 0;
create table t1 (a datetime, i int, b datetime); 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; select a != b from t1;
a != b a != b
1 1

2
mysql-test/t/func_time.test
View File

@@ -650,7 +650,7 @@ drop table t1;
SET GLOBAL log_bin_trust_function_creators = 0; SET GLOBAL log_bin_trust_function_creators = 0;
create table t1 (a datetime, i int, b datetime); 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; select a != b from t1;
drop table t1; drop table t1;

3
storage/maria/ma_loghandler.c
View File

@@ -1211,9 +1211,10 @@ static my_bool translog_set_lsn_for_files(uint32 from_file, uint32 to_file,
for (file= from_file; file <= to_file; file++) for (file= from_file; file <= to_file; file++)
{ {
LOGHANDLER_FILE_INFO info; LOGHANDLER_FILE_INFO info;
File fd;
LINT_INIT(info.max_lsn); 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) || if ((fd < 0) ||
((translog_read_file_header(&info, fd) || ((translog_read_file_header(&info, fd) ||
(cmp_translog_addr(lsn, info.max_lsn) > 0 && (cmp_translog_addr(lsn, info.max_lsn) > 0 &&