summaryrefslogtreecommitdiff
path: root/sql/rpl_injector.h
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2015-07-06 20:24:14 +0300
committerMonty <monty@mariadb.org>2015-07-06 20:24:14 +0300
commit7332af49e4ce125a5e316e7e0c82d44df4af54c4 (patch)
tree179f863cbb314d7610bf12e1b0ffb785d6ea26e9 /sql/rpl_injector.h
parent8d4d185a08cd758d552d233c26f68af4caa28388 (diff)
downloadmariadb-git-7332af49e4ce125a5e316e7e0c82d44df4af54c4.tar.gz
- Renaming variables so that they don't shadow others (After this patch one can compile with -Wshadow and get much fewer warnings)
- Changed ER(ER_...) to ER_THD(thd, ER_...) when thd was known or if there was many calls to current_thd in the same function. - Changed ER(ER_..) to ER_THD_OR_DEFAULT(current_thd, ER...) in some places where current_thd is not necessary defined. - Removing calls to current_thd when we have access to thd Part of this is optimization (not calling current_thd when not needed), but part is bug fixing for error condition when current_thd is not defined (For example on startup and end of mysqld) Notable renames done as otherwise a lot of functions would have to be changed: - In JOIN structure renamed: examined_rows -> join_examined_rows record_count -> join_record_count - In Field, renamed new_field() to make_new_field() Other things: - Added DBUG_ASSERT(thd == tmp_thd) in Item_singlerow_subselect() just to be safe. - Removed old 'tab' prefix in JOIN_TAB::save_explain_data() and use members directly - Added 'thd' as argument to a few functions to avoid calling current_thd.
Diffstat (limited to 'sql/rpl_injector.h')
-rw-r--r--sql/rpl_injector.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rpl_injector.h b/sql/rpl_injector.h
index 98788955e24..6be3d7cf4ec 100644
--- a/sql/rpl_injector.h
+++ b/sql/rpl_injector.h
@@ -117,8 +117,8 @@ public:
class table
{
public:
- table(TABLE *table, bool is_transactional)
- : m_table(table), m_is_transactional(is_transactional)
+ table(TABLE *table, bool is_transactional_arg)
+ : m_table(table), m_is_transactional(is_transactional_arg)
{
}