summaryrefslogtreecommitdiff
path: root/sql/handler.h
diff options
context:
space:
mode:
authorunknown <sanja@askmonty.org>2014-04-28 09:13:53 +0300
committerunknown <sanja@askmonty.org>2014-04-28 09:13:53 +0300
commit968f4d4e2573fc409d5a17103269cfdcef7c2878 (patch)
tree380f052461b134a8ff9b1eb0edaaf2df0b4030fc /sql/handler.h
parent772aa0c57525706a9f6e3285005ff22fc115b647 (diff)
downloadmariadb-git-968f4d4e2573fc409d5a17103269cfdcef7c2878.tar.gz
MDEV-6139: UPDATE w/ join against MRG_MyISAM table with read-only sub-table failsUPDATE w/ join against MRG_MyISAM table with read-only sub-table fails
The problem was that on opening all tables TL_WRITE, than local tables which is not updated set to TL_READ, but underlying tables of MyISAMmrg left untouched. Prartition engine has not this problem. All cases where lock_type assigned is not changed because call of virtual function is not cheap.
Diffstat (limited to 'sql/handler.h')
-rw-r--r--sql/handler.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/handler.h b/sql/handler.h
index f557db64221..5f8b4cde4a7 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -2952,6 +2952,8 @@ public:
inline int ha_write_tmp_row(uchar *buf);
inline int ha_update_tmp_row(const uchar * old_data, uchar * new_data);
+ virtual void ha_set_lock_type(enum thr_lock_type lock);
+
friend enum icp_result handler_index_cond_check(void* h_arg);
};