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

diff --git a/sql/derror.cc b/sql/derror.cc
index 7ac068300f9..bc4b89493aa 100644
--- a/sql/derror.cc
+++ b/sql/derror.cc
@@ -244,20 +244,20 @@ static void init_myfunc_errs()
   init_glob_errs();			/* Initiate english errors */
   if (!(specialflag & SPECIAL_ENGLISH))
   {
-    EE(EE_FILENOTFOUND)   = ER(ER_FILE_NOT_FOUND);
-    EE(EE_CANTCREATEFILE) = ER(ER_CANT_CREATE_FILE);
-    EE(EE_READ)           = ER(ER_ERROR_ON_READ);
-    EE(EE_WRITE)          = ER(ER_ERROR_ON_WRITE);
-    EE(EE_BADCLOSE)       = ER(ER_ERROR_ON_CLOSE);
-    EE(EE_OUTOFMEMORY)    = ER(ER_OUTOFMEMORY);
-    EE(EE_DELETE)         = ER(ER_CANT_DELETE_FILE);
-    EE(EE_LINK)           = ER(ER_ERROR_ON_RENAME);
-    EE(EE_EOFERR)         = ER(ER_UNEXPECTED_EOF);
-    EE(EE_CANTLOCK)       = ER(ER_CANT_LOCK);
-    EE(EE_DIR)            = ER(ER_CANT_READ_DIR);
-    EE(EE_STAT)           = ER(ER_CANT_GET_STAT);
-    EE(EE_GETWD)          = ER(ER_CANT_GET_WD);
-    EE(EE_SETWD)          = ER(ER_CANT_SET_WD);
-    EE(EE_DISK_FULL)      = ER(ER_DISK_FULL);
+    EE(EE_FILENOTFOUND)   = ER_DEFAULT(ER_FILE_NOT_FOUND);
+    EE(EE_CANTCREATEFILE) = ER_DEFAULT(ER_CANT_CREATE_FILE);
+    EE(EE_READ)           = ER_DEFAULT(ER_ERROR_ON_READ);
+    EE(EE_WRITE)          = ER_DEFAULT(ER_ERROR_ON_WRITE);
+    EE(EE_BADCLOSE)       = ER_DEFAULT(ER_ERROR_ON_CLOSE);
+    EE(EE_OUTOFMEMORY)    = ER_DEFAULT(ER_OUTOFMEMORY);
+    EE(EE_DELETE)         = ER_DEFAULT(ER_CANT_DELETE_FILE);
+    EE(EE_LINK)           = ER_DEFAULT(ER_ERROR_ON_RENAME);
+    EE(EE_EOFERR)         = ER_DEFAULT(ER_UNEXPECTED_EOF);
+    EE(EE_CANTLOCK)       = ER_DEFAULT(ER_CANT_LOCK);
+    EE(EE_DIR)            = ER_DEFAULT(ER_CANT_READ_DIR);
+    EE(EE_STAT)           = ER_DEFAULT(ER_CANT_GET_STAT);
+    EE(EE_GETWD)          = ER_DEFAULT(ER_CANT_GET_WD);
+    EE(EE_SETWD)          = ER_DEFAULT(ER_CANT_SET_WD);
+    EE(EE_DISK_FULL)      = ER_DEFAULT(ER_DISK_FULL);
   }
 }