Fixed compiler warning and unitialized memory warning

- The valgrind warning came from JOIN::optimize() (sql_select.cc:1123)
MariaDB · Nov 2, 2017 · 3ab112e · 3ab112e
1 parent a17e7d0
commit 3ab112e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/sql/sql_select.h b/sql/sql_select.h
@@ -1464,6 +1464,8 @@ class JOIN :public Sql_alloc
     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
@@ -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
 
 /***********************************************************************/