summaryrefslogtreecommitdiff
path: root/storage/csv
diff options
context:
space:
mode:
authorunknown <petr@mysql.com>2006-05-31 10:50:35 +0400
committerunknown <petr@mysql.com>2006-05-31 10:50:35 +0400
commit883f72a6b4e21f5d133bb09260f77481ac6f49d2 (patch)
treef4357c50befd495365dcee1f49cb02bc498c91b4 /storage/csv
parentd948704bbaeff69310d7ccaa293b8d36f3777a59 (diff)
downloadmariadb-git-883f72a6b4e21f5d133bb09260f77481ac6f49d2.tar.gz
fix csv test failure on aix
storage/csv/ha_tina.cc: one cannot sync file, opened for reading
Diffstat (limited to 'storage/csv')
-rw-r--r--storage/csv/ha_tina.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc
index 3f9320b7e19..35d7fc8d4a3 100644
--- a/storage/csv/ha_tina.cc
+++ b/storage/csv/ha_tina.cc
@@ -1267,8 +1267,10 @@ int ha_tina::rnd_end()
}
- if (my_close(update_temp_file, MYF(0)))
+ if (my_sync(update_temp_file, MYF(MY_WME)) ||
+ my_close(update_temp_file, MYF(0)))
DBUG_RETURN(-1);
+
share->update_file_opened= FALSE;
if (share->tina_write_opened)
@@ -1292,9 +1294,8 @@ int ha_tina::rnd_end()
share->data_file_name, MYF(0)))
DBUG_RETURN(-1);
- /* Open the file again and sync it */
- if (((data_file= my_open(share->data_file_name, O_RDONLY, MYF(0))) == -1)
- || my_sync(data_file, MYF(MY_WME)))
+ /* Open the file again */
+ if (((data_file= my_open(share->data_file_name, O_RDONLY, MYF(0))) == -1))
DBUG_RETURN(-1);
/*
The datafile is consistent at this point and the write filedes is