rename handler::ha_set_lock_type() -> handler::set_lock_type(),

because it's not a handler convenience wrapper

sql/handler.cc

@@ -5285,7 +5285,7 @@ void signal_log_not_needed(struct handlerton, char *log_file)
   DBUG_VOID_RETURN;
 }
 
-void handler::ha_set_lock_type(enum thr_lock_type lock)
+void handler::set_lock_type(enum thr_lock_type lock)
 {
   table->reginfo.lock_type= lock;
 }

sql/handler.h

@@ -2952,7 +2952,7 @@ class handler :public Sql_alloc
   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);
+  virtual void set_lock_type(enum thr_lock_type lock);
 
   friend enum icp_result handler_index_cond_check(void* h_arg);
 };

sql/sql_update.cc

@@ -1304,7 +1304,7 @@ int mysql_multi_update_prepare(THD *thd)
       tl->updating= 0;
       /* Update TABLE::lock_type accordingly. */
       if (!tl->placeholder() && !using_lock_tables)
-        tl->table->file->ha_set_lock_type(tl->lock_type);
+        tl->table->file->set_lock_type(tl->lock_type);
     }
   }
   for (tl= table_list; tl; tl= tl->next_local)

storage/myisammrg/ha_myisammrg.cc

@@ -1714,9 +1714,9 @@ my_bool ha_myisammrg::register_query_cache_dependant_tables(THD *thd
 }
 
 
-void ha_myisammrg::ha_set_lock_type(enum thr_lock_type lock)
+void ha_myisammrg::set_lock_type(enum thr_lock_type lock)
 {
-  handler::ha_set_lock_type(lock);
+  handler::set_lock_type(lock);
   if (children_l != NULL)
   {
     for (TABLE_LIST *child_table= children_l;;

storage/myisammrg/ha_myisammrg.h

@@ -155,5 +155,5 @@ class ha_myisammrg: public handler
                                           Query_cache *cache,
                                           Query_cache_block_table **block,
                                           uint *n);
-  virtual void ha_set_lock_type(enum thr_lock_type lock);
+  virtual void set_lock_type(enum thr_lock_type lock);
 };