summaryrefslogtreecommitdiff
path: root/storage/maria/ma_loghandler.c
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2010-04-08 12:47:31 +0300
committerMichael Widenius <monty@askmonty.org>2010-04-08 12:47:31 +0300
commit34a6810dac4851483ada8b743cfd896eb5b43ff6 (patch)
treeb84f6d9033651c562714982b964cdca2791c9c36 /storage/maria/ma_loghandler.c
parent236527688fa73a7132945d76c1100acf4d8e3ab2 (diff)
downloadmariadb-git-34a6810dac4851483ada8b743cfd896eb5b43ff6.tar.gz
Fixed syntax error and some timeing issues in test suite
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
Diffstat (limited to 'storage/maria/ma_loghandler.c')
-rw-r--r--storage/maria/ma_loghandler.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c
index 5e316e2d776..8ffaf22d1b0 100644
--- a/storage/maria/ma_loghandler.c
+++ b/storage/maria/ma_loghandler.c
@@ -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++)
{
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 &&