diff options
| author | Monty <monty@mariadb.org> | 2015-07-06 20:24:14 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2015-07-06 20:24:14 +0300 |
| commit | 7332af49e4ce125a5e316e7e0c82d44df4af54c4 (patch) | |
| tree | 179f863cbb314d7610bf12e1b0ffb785d6ea26e9 /sql/unireg.h | |
| parent | 8d4d185a08cd758d552d233c26f68af4caa28388 (diff) | |
| download | mariadb-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/unireg.h')
| -rw-r--r-- | sql/unireg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/unireg.h b/sql/unireg.h index 25335d11e4a..8e73fd8da18 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -49,6 +49,7 @@ #define ER(X) CURRENT_THD_ERRMSGS[(X) - ER_ERROR_FIRST] #define ER_DEFAULT(X) DEFAULT_ERRMSGS[(X) - ER_ERROR_FIRST] #define ER_SAFE(X) (((X) >= ER_ERROR_FIRST && (X) <= ER_ERROR_LAST) ? ER(X) : "Invalid error code") +#define ER_SAFE_THD(T,X) (((X) >= ER_ERROR_FIRST && (X) <= ER_ERROR_LAST) ? ER_THD(T,X) : "Invalid error code") #define ER_THD(thd,X) ((thd)->variables.lc_messages->errmsgs->errmsgs[(X) - \ ER_ERROR_FIRST]) #define ER_THD_OR_DEFAULT(thd,X) ((thd) ? ER_THD(thd, X) : ER_DEFAULT(X)) |