From 0e05dc81b3ff42bacb03eb6826ae75876bef2025 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Mon, 28 Apr 2014 11:11:16 +0200
Subject: [PATCH] rename handler::ha_set_lock_type() ->
 handler::set_lock_type(), because it's not a handler convenience wrapper

---
 sql/handler.cc                    | 2 +-
 sql/handler.h                     | 2 +-
 sql/sql_update.cc                 | 2 +-
 storage/myisammrg/ha_myisammrg.cc | 4 ++--
 storage/myisammrg/ha_myisammrg.h  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sql/handler.cc b/sql/handler.cc
index f08d4a37e1d..2e20944a96b 100644
--- a/sql/handler.cc
+++ b/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;
 }
diff --git a/sql/handler.h b/sql/handler.h
index 5f8b4cde4a7..d7b92003083 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -2952,7 +2952,7 @@ 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);
+  virtual void set_lock_type(enum thr_lock_type lock);
 
   friend enum icp_result handler_index_cond_check(void* h_arg);
 };
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index 190e2e9a84d..b60f21ca9d5 100644
--- a/sql/sql_update.cc
+++ b/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)
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc
index 388c9c9895d..72850603cfd 100644
--- a/storage/myisammrg/ha_myisammrg.cc
+++ b/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;;
diff --git a/storage/myisammrg/ha_myisammrg.h b/storage/myisammrg/ha_myisammrg.h
index ce9c1917118..ab2ba3e70c6 100644
--- a/storage/myisammrg/ha_myisammrg.h
+++ b/storage/myisammrg/ha_myisammrg.h
@@ -155,5 +155,5 @@ public:
                                           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);
 };