diff options
| author | Monty <monty@mariadb.org> | 2017-11-01 20:30:45 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-11-02 20:37:26 +0200 |
| commit | 3ab112eb39dad0ac4bd9d68306cf6040161e9dc2 (patch) | |
| tree | 208b97ef2b260bfae4bd6d42301fb05782fb1040 | |
| parent | a17e7d0747ae51b9df4474edbbab0b08106e5bc9 (diff) | |
| download | mariadb-git-3ab112eb39dad0ac4bd9d68306cf6040161e9dc2.tar.gz | |
Fixed compiler warning and unitialized memory warning
- The valgrind warning came from JOIN::optimize() (sql_select.cc:1123)
| -rw-r--r-- | sql/sql_select.h | 2 | ||||
| -rw-r--r-- | storage/connect/tabtbl.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index b6b8deb99f5..1a94ec2894f 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -1464,6 +1464,8 @@ public: ordered_index_usage= ordered_index_void; need_distinct= 0; skip_sort_order= 0; + with_two_phase_optimization= 0; + is_for_splittable_grouping_derived= 0; need_tmp= 0; hidden_group_fields= 0; /*safety*/ error= 0; diff --git a/storage/connect/tabtbl.cpp b/storage/connect/tabtbl.cpp index 0c56b3e6614..9b83a1c93a5 100644 --- a/storage/connect/tabtbl.cpp +++ b/storage/connect/tabtbl.cpp @@ -650,7 +650,7 @@ bool TDBTBM::IsLocal(PTABLE tbp) return ((!stricmp(tdbp->Host, "localhost") || !strcmp(tdbp->Host, "127.0.0.1")) && - tdbp->Port == (int)GetDefaultPort()); + (int) tdbp->Port == (int)GetDefaultPort()); } // end of IsLocal /***********************************************************************/ |