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/sql_priv.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/sql_priv.h')
| -rw-r--r-- | sql/sql_priv.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_priv.h b/sql/sql_priv.h index 7ba027d2380..b09a6c84c83 100644 --- a/sql/sql_priv.h +++ b/sql/sql_priv.h @@ -51,9 +51,9 @@ compile_time_assert(MYSQL_VERSION_ID < VerHi * 10000 + VerLo * 100); \ if (((THD *) Thd) != NULL) \ push_warning_printf(((THD *) Thd), Sql_condition::WARN_LEVEL_WARN, \ - ER_WARN_DEPRECATED_SYNTAX, \ - ER(ER_WARN_DEPRECATED_SYNTAX), \ - (Old), (New)); \ + ER_WARN_DEPRECATED_SYNTAX, \ + ER_THD(((THD *) Thd), ER_WARN_DEPRECATED_SYNTAX), \ + (Old), (New)); \ else \ sql_print_warning("The syntax '%s' is deprecated and will be removed " \ "in a future release. Please use %s instead.", \ @@ -79,8 +79,8 @@ do { \ if (((THD *) Thd) != NULL) \ push_warning_printf(((THD *) Thd), Sql_condition::WARN_LEVEL_WARN, \ - ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT, \ - ER(ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT), \ + ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT, \ + ER_THD(((THD *) Thd), ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT), \ (Old)); \ else \ sql_print_warning("'%s' is deprecated and will be removed " \ |