summaryrefslogtreecommitdiff
path: root/storage/csv
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-10-14 12:25:39 +0400
committerAlexander Nozdrin <alik@sun.com>2009-10-14 12:25:39 +0400
commitca08f10ccd20213ad2ac1fa19f19cd7dfbcc5d7d (patch)
tree1b3260f72106f50b182546dff41127a389144fa1 /storage/csv
parent946dc457facc58517e9c47f1c5ad0029e529da79 (diff)
parent32e51de7f58d6f3e82c97fe9ab37d8d8246b762b (diff)
downloadmariadb-git-ca08f10ccd20213ad2ac1fa19f19cd7dfbcc5d7d.tar.gz
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'storage/csv')
-rw-r--r--storage/csv/ha_tina.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc
index 63eb572105c..07c4785ab90 100644
--- a/storage/csv/ha_tina.cc
+++ b/storage/csv/ha_tina.cc
@@ -1615,8 +1615,8 @@ int ha_tina::check(THD* thd, HA_CHECK_OPT* check_opt)
share->crashed= TRUE;
DBUG_RETURN(HA_ADMIN_CORRUPT);
}
- else
- DBUG_RETURN(HA_ADMIN_OK);
+
+ DBUG_RETURN(HA_ADMIN_OK);
}