- 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, 4 insertions, 4 deletions

diff --git a/sql/item_xmlfunc.h b/sql/item_xmlfunc.h
index 637f505e12e..5b699869b2e 100644
--- a/sql/item_xmlfunc.h
+++ b/sql/item_xmlfunc.h
@@ -69,11 +69,11 @@ protected:
   };
   Item *nodeset_func;
   XML xml;
-  bool get_xml(XML *xml, bool cache= false)
+  bool get_xml(XML *xml_arg, bool cache= false)
   {
-    if (!cache && xml->cached())
-      return xml->raw() == 0;
-    return xml->parse(args[0], cache);
+    if (!cache && xml_arg->cached())
+      return xml_arg->raw() == 0;
+    return xml_arg->parse(args[0], cache);
   }
 public:
   Item_xml_str_func(Item *a, Item *b):