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

diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c
index 37dad48396a..dfff3b28440 100644
--- a/mysys/thr_lock.c
+++ b/mysys/thr_lock.c
@@ -345,15 +345,14 @@ static void check_locks(THR_LOCK *lock, const char *where,
 		    "Warning at '%s': Write lock %d waiting while no exclusive read locks\n",where,(int) lock->write_wait.data->type);
             DBUG_PRINT("warning", ("Warning at '%s': Write lock %d waiting while no exclusive read locks",where,(int) lock->write_wait.data->type));
 	  }
-	}	      
+        }
       }
       else
       {
         /* We have at least one write lock */
         if (lock->write.data->type == TL_WRITE_CONCURRENT_INSERT)
         {
-          THR_LOCK_DATA *data;
-          uint count= 0;
+          count= 0;
           for (data=lock->write.data->next;
                data && count < MAX_LOCKS;
                data=data->next)
@@ -386,7 +385,6 @@ static void check_locks(THR_LOCK *lock, const char *where,
 	}
 	if (lock->read.data)
 	{
-          THR_LOCK_DATA *data;
           for (data=lock->read.data ; data ; data=data->next)
           {
             if (!thr_lock_owner_equal(lock->write.data->owner,