1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
because it's not a handler convenience wrapper
This commit is contained in:
Sergei Golubchik 2014-04-28 11:11:16 +02:00
parent 84d13a7e88
commit 0e05dc81b3
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/handler.cc
View File

@ -5285,7 +5285,7 @@ void signal_log_not_needed(struct handlerton, char *log_file)
DBUG_VOID_RETURN; 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; table->reginfo.lock_type= lock;
} }

2
sql/handler.h
View File

@ -2952,7 +2952,7 @@ public:
inline int ha_write_tmp_row(uchar *buf); inline int ha_write_tmp_row(uchar *buf);
inline int ha_update_tmp_row(const uchar * old_data, uchar * new_data); 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); friend enum icp_result handler_index_cond_check(void* h_arg);
}; };

2
sql/sql_update.cc
View File

@ -1304,7 +1304,7 @@ int mysql_multi_update_prepare(THD *thd)
tl->updating= 0; tl->updating= 0;
/* Update TABLE::lock_type accordingly. */ /* Update TABLE::lock_type accordingly. */
if (!tl->placeholder() && !using_lock_tables) 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) for (tl= table_list; tl; tl= tl->next_local)

4
storage/myisammrg/ha_myisammrg.cc
View File

@ -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) if (children_l != NULL)
{ {
for (TABLE_LIST *child_table= children_l;; for (TABLE_LIST *child_table= children_l;;

2
storage/myisammrg/ha_myisammrg.h
View File

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