- 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.

1 files changed, 3 insertions, 2 deletions

diff --git a/sql/create_options.cc b/sql/create_options.cc
index c3796710f78..66515be05b8 100644
--- a/sql/create_options.cc
+++ b/sql/create_options.cc
@@ -88,7 +88,7 @@ static bool report_wrong_value(THD *thd, const char *name, const char *val,
   }
 
   push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, ER_BAD_OPTION_VALUE,
-                      ER(ER_BAD_OPTION_VALUE), val, name);
+                      ER_THD(thd, ER_BAD_OPTION_VALUE), val, name);
   return 0;
 }
 
@@ -111,7 +111,8 @@ static bool report_unknown_option(THD *thd, engine_option_value *val,
   }
 
   push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
-                      ER_UNKNOWN_OPTION, ER(ER_UNKNOWN_OPTION), val->name.str);
+                      ER_UNKNOWN_OPTION, ER_THD(thd, ER_UNKNOWN_OPTION),
+                      val->name.str);
   DBUG_RETURN(FALSE);
 }