diff options
| author | Michael Widenius <monty@mariadb.org> | 2018-04-11 02:20:22 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mariadb.org> | 2018-04-16 20:16:43 +0300 |
| commit | ddc5764303dd72f68d2c69cc574a6f42e8bcf86d (patch) | |
| tree | ce22119346b027d359a909f7e272330dabd4c19b /sql/sql_base.cc | |
| parent | dbbe70e1cfe9d7635d9dba774a2c9dc61163b542 (diff) | |
| download | mariadb-git-ddc5764303dd72f68d2c69cc574a6f42e8bcf86d.tar.gz | |
Remove compiler warnings
- Remove unused variables
- Mark variables unused
- Fix wrong types
- Add no-strict-aliasing to BUILD scripts
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 5ce6a6b001c..3de45b0ad66 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -6548,7 +6548,7 @@ mark_common_columns(THD *thd, TABLE_LIST *table_ref_1, TABLE_LIST *table_ref_2, Query_arena *arena, backup; bool result= TRUE; bool first_outer_loop= TRUE; - Field *field_1, *field_2; + Field *field_1; field_visibility_t field_1_invisible, field_2_invisible; /* Leaf table references to which new natural join columns are added @@ -6572,6 +6572,8 @@ mark_common_columns(THD *thd, TABLE_LIST *table_ref_1, TABLE_LIST *table_ref_2, { bool found= FALSE; const LEX_CSTRING *field_name_1; + Field *field_2= 0; + /* true if field_name_1 is a member of using_fields */ bool is_using_column_1; if (!(nj_col_1= it_1.get_or_create_column_ref(thd, leaf_1))) |