summaryrefslogtreecommitdiff
path: root/storage/csv
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2020-06-03 19:40:41 +0300
committerMonty <monty@mariadb.org>2020-06-14 19:39:42 +0300
commit10b88deb74a77e75c49b8fc63fef666eaddc2e6e (patch)
treee0b12d095b2235b1a4df45f67674e580fcae0af2 /storage/csv
parent74df3c8024faa55faa361edb0a80548c9b36815c (diff)
downloadmariadb-git-10b88deb74a77e75c49b8fc63fef666eaddc2e6e.tar.gz
Changes needed for ColumnStore and insert cache
MCOL-3875 Columnstore write cache The main change is to change thr_lock function get_status to return a value that indicates we have to abort the lock. Other thing: - Made start_bulk_insert() and end_bulk_insert() protected so that the insert cache can use these
Diffstat (limited to 'storage/csv')
-rw-r--r--storage/csv/ha_tina.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc
index d9473a8b045..4983236d840 100644
--- a/storage/csv/ha_tina.cc
+++ b/storage/csv/ha_tina.cc
@@ -883,10 +883,11 @@ err:
for CSV engine. For more details see mysys/thr_lock.c
*/
-void tina_get_status(void* param, my_bool concurrent_insert)
+my_bool tina_get_status(void* param, my_bool concurrent_insert)
{
ha_tina *tina= (ha_tina*) param;
tina->get_status();
+ return 0;
}
void tina_update_status(void* param)