summaryrefslogtreecommitdiff
path: root/storage/csv
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-04-14 10:04:07 +0200
committerSergei Golubchik <sergii@pisem.net>2013-04-14 10:04:07 +0200
commitf57ecb7786177e0af3b1e3ec94302720b2e0f967 (patch)
treefcbed357c5bcdb373830413086d4f58ff9ba2998 /storage/csv
parent9bfbe7fbce86eab5a8a5de7e401772f058872716 (diff)
parentd364e64ae28c5588ea0ad013738a8dfe18412292 (diff)
downloadmariadb-git-f57ecb7786177e0af3b1e3ec94302720b2e0f967.tar.gz
5.5 merge
Diffstat (limited to 'storage/csv')
-rw-r--r--storage/csv/ha_tina.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc
index ab2e2c118f8..c51e2b9c968 100644
--- a/storage/csv/ha_tina.cc
+++ b/storage/csv/ha_tina.cc
@@ -1426,9 +1426,9 @@ int ha_tina::rnd_end()
DBUG_RETURN(-1);
/* Open the file again */
- if (((data_file= mysql_file_open(csv_key_file_data,
- share->data_file_name,
- O_RDONLY, MYF(MY_WME))) == -1))
+ if ((data_file= mysql_file_open(csv_key_file_data,
+ share->data_file_name,
+ O_RDONLY, MYF(MY_WME))) == -1)
DBUG_RETURN(my_errno ? my_errno : -1);
/*
As we reopened the data file, increase share->data_file_version