MDEV-4243 [PATCH] Warnings/errors while compiling with clang

fix the code to compile with clang. fix warnings too.

include/probes_mysql_nodtrace.h:
  clang++ doesn't like numeric _constants_ being used in ||
  (it suspects that the intention was | ). Boolean constants are ok.
sql/hostname.cc:
  only used in DBUG_ASSERT
sql/item.cc:
  str_to_time and str_to_datetime return bool, not MYSQL_TIMESTAMP_xxx
sql/item_func.cc:
  str_to_datetime_with_warn() returns bool, not MYSQL_TIMESTAMP_xxx
storage/cassandra/CMakeLists.txt:
  CMAKE_CXX_FLAGS can be empty
storage/connect/odbconn.cpp:
  HWND is void*
storage/connect/user_connect.h:
  deprecated on FreeBSD and unused anyway
storage/connect/value.cpp:
  bad characters inside. unused.
storage/spider/spd_trx.cc:
  clang++ warns that memset will also overwrite vtbl. it might be as well a good idea,
  as it asserts that the object will only be used as a storage.
  silence the warning.

10 files changed, 29 insertions, 35 deletions

diff --git a/storage/cassandra/CMakeLists.txt b/storage/cassandra/CMakeLists.txt
index eb3bf7a115a..9fdf61908db 100644
--- a/storage/cassandra/CMakeLists.txt
+++ b/storage/cassandra/CMakeLists.txt
@@ -21,8 +21,8 @@ ENDIF()
 INCLUDE_DIRECTORIES(AFTER ${Thrift_INCLUDE_DIRS}/..) 
 SET(CMAKE_REQUIRED_INCLUDES ${Thrift_INCLUDE_DIRS})
 
-STRING(REPLACE "-fno-exceptions" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+STRING(REPLACE "-fno-exceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 
 SET(CMAKE_REQUIRED_INCLUDES "${Thrift_INCLUDE_DIRS}/..")
 CHECK_CXX_SOURCE_COMPILES(
diff --git a/storage/cassandra/cassandra_se.cc b/storage/cassandra/cassandra_se.cc
index 111f30f715f..384f04d1c04 100644
--- a/storage/cassandra/cassandra_se.cc
+++ b/storage/cassandra/cassandra_se.cc
@@ -101,7 +101,7 @@ public:
   const char* get_default_validator();
 
   /* Settings */
-  void set_consistency_levels(ulong read_cons_level, ulong write_cons_level);
+  void set_consistency_levels(unsigned long read_cons_level, unsigned long write_cons_level);
   virtual void set_n_retries(uint retries_arg) {
     thrift_call_retries_to_do= retries_arg;
   }
@@ -228,8 +228,8 @@ bool Cassandra_se_impl::reconnect()
 }
 
 
-void Cassandra_se_impl::set_consistency_levels(ulong read_cons_level,
-                                               ulong write_cons_level)
+void Cassandra_se_impl::set_consistency_levels(unsigned long read_cons_level,
+                                               unsigned long write_cons_level)
 {
   write_cons_level= (ConsistencyLevel::type)(write_cons_level + 1);
   read_cons_level=  (ConsistencyLevel::type)(read_cons_level + 1);
diff --git a/storage/cassandra/cassandra_se.h b/storage/cassandra/cassandra_se.h
index 2d3d5f27a56..d1286ae2d0b 100644
--- a/storage/cassandra/cassandra_se.h
+++ b/storage/cassandra/cassandra_se.h
@@ -44,7 +44,7 @@ public:
   virtual void set_column_family(const char *cfname) = 0;
 
   /* Settings */
-  virtual void set_consistency_levels(ulong read_cons_level, ulong write_cons_level)=0;
+  virtual void set_consistency_levels(unsigned long read_cons_level, unsigned long write_cons_level)=0;
   virtual void set_n_retries(uint retries_arg)=0;
 
   /* Check underlying DDL */
@@ -105,16 +105,16 @@ public:
 class Cassandra_status_vars
 {
 public:
-  ulong row_inserts;
-  ulong row_insert_batches;
+  unsigned long row_inserts;
+  unsigned long row_insert_batches;
 
-  ulong multiget_reads;
-  ulong multiget_keys_scanned;
-  ulong multiget_rows_read;
+  unsigned long multiget_reads;
+  unsigned long multiget_keys_scanned;
+  unsigned long multiget_rows_read;
 
-  ulong timeout_exceptions;
-  ulong unavailable_exceptions;
-  ulong network_exceptions;
+  unsigned long timeout_exceptions;
+  unsigned long unavailable_exceptions;
+  unsigned long network_exceptions;
 };
 
 
diff --git a/storage/connect/connect.cc b/storage/connect/connect.cc
index fd5f6fe6d5d..5ea2691d2f2 100644
--- a/storage/connect/connect.cc
+++ b/storage/connect/connect.cc
@@ -21,7 +21,7 @@
 /* -----------------------                                             */
 /*  This program are the CONNECT general purpose semantic routines.    */
 /***********************************************************************/
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation        // gcc: Class implementation
 #endif
 
diff --git a/storage/connect/filamdbf.cpp b/storage/connect/filamdbf.cpp
index 0a67195b200..02404a7c1f5 100644
--- a/storage/connect/filamdbf.cpp
+++ b/storage/connect/filamdbf.cpp
@@ -534,7 +534,8 @@ bool DBFFAM::AllocateBuffer(PGLOBAL g)
     if (!len) {
       // Make the header for this DBF table file
       struct tm  *datm;
-      int         hlen, n = 0, reclen = 1;
+      int         hlen, n = 0;
+      ushort      reclen = 1;
       time_t      t;
       DBFHEADER  *header;
       DESCRIPTOR *descp;
diff --git a/storage/connect/fmdlex.c b/storage/connect/fmdlex.c
index 7a7cd1ad753..a72a2b9b31e 100644
--- a/storage/connect/fmdlex.c
+++ b/storage/connect/fmdlex.c
@@ -395,7 +395,9 @@ char *yytext;
 #include <string.h>
 #include "preparse.h"
 
+#ifndef fileno
 #define fileno _fileno
+#endif
 #undef  YY_DECL
 #define YY_DECL int yylex YY_PROTO((PDTP ppp))
 #define YYSTATE    ((yy_start-1)/2)
diff --git a/storage/connect/user_connect.h b/storage/connect/user_connect.h
index 98c83b55d16..386e678b138 100644
--- a/storage/connect/user_connect.h
+++ b/storage/connect/user_connect.h
@@ -28,12 +28,6 @@
 #pragma interface     /* gcc class implementation */
 #endif
 
-#if defined(WIN32)
-#include <sys\timeb.h>
-#else
-#include <sys/timeb.h>
-#endif   // UBUNTU
-
 /*****************************************************************************/
 /*  This is the global structure having all CONNECT information.             */
 /*****************************************************************************/
diff --git a/storage/connect/value.cpp b/storage/connect/value.cpp
index 077df346459..a03ca483bc3 100644
--- a/storage/connect/value.cpp
+++ b/storage/connect/value.cpp
@@ -71,9 +71,7 @@
 /***********************************************************************/
 /*  Static variables.                                                  */
 /***********************************************************************/
-static char *list =
-  " ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789/.*-‘abcdefghijklmnopqrstuv"; //wxyzñ'
-//" ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz.";
+
 extern "C" int  trace;
 
 /***********************************************************************/
diff --git a/storage/maria/ma_check.c b/storage/maria/ma_check.c
index 78550145535..e91ffd87e0a 100644
--- a/storage/maria/ma_check.c
+++ b/storage/maria/ma_check.c
@@ -1833,11 +1833,9 @@ static int check_block_record(HA_CHECK *param, MARIA_HA *info, int extend,
   char llbuff[22], llbuff2[22];
   uint block_size= share->block_size;
   ha_rows full_page_count, tail_count;
-  my_bool full_dir, now_transactional;
+  my_bool UNINIT_VAR(full_dir), now_transactional;
   uint offset_page, offset, free_count;
 
-  LINT_INIT(full_dir);
-
   if (_ma_scan_init_block_record(info))
   {
     _ma_check_print_error(param, "got error %d when initializing scan",
@@ -1859,7 +1857,8 @@ static int check_block_record(HA_CHECK *param, MARIA_HA *info, int extend,
        pos < share->state.state.data_file_length;
        pos+= block_size, page++)
   {
-    uint UNINIT_VAR(row_count), real_row_count, empty_space, page_type, bitmap_pattern;
+    uint UNINIT_VAR(row_count), real_row_count, UNINIT_VAR(empty_space),
+         page_type, bitmap_pattern;
     uint bitmap_for_page;
 
     if (_ma_killed_ptr(param))
diff --git a/storage/spider/spd_trx.cc b/storage/spider/spd_trx.cc
index cf3fe3580c7..8a89804d923 100644
--- a/storage/spider/spd_trx.cc
+++ b/storage/spider/spd_trx.cc
@@ -246,7 +246,7 @@ int spider_trx_another_lock_tables(
   SPIDER_BACKUP_DASTATUS;
   sql_str.init_calc_mem(188);
   sql_str.length(0);
-  memset(&tmp_spider, 0, sizeof(ha_spider));
+  memset((void*)&tmp_spider, 0, sizeof(ha_spider));
   memset(&tmp_share, 0, sizeof(SPIDER_SHARE));
   tmp_spider.share = &tmp_share;
   tmp_spider.trx = trx;
@@ -292,7 +292,7 @@ int spider_trx_another_flush_tables(
   long tmp_link_statuses = SPIDER_LINK_STATUS_OK;
   DBUG_ENTER("spider_trx_another_flush_tables");
   SPIDER_BACKUP_DASTATUS;
-  memset(&tmp_spider, 0, sizeof(ha_spider));
+  memset((void*)&tmp_spider, 0, sizeof(ha_spider));
   tmp_share.link_count = 1;
   tmp_share.all_link_count = 1;
   tmp_share.link_statuses = &tmp_link_statuses;
@@ -326,7 +326,7 @@ int spider_trx_all_flush_tables(
   long tmp_link_statuses = SPIDER_LINK_STATUS_OK;
   DBUG_ENTER("spider_trx_all_flush_tables");
   SPIDER_BACKUP_DASTATUS;
-  memset(&tmp_spider, 0, sizeof(ha_spider));
+  memset((void*)&tmp_spider, 0, sizeof(ha_spider));
   tmp_share.link_count = 1;
   tmp_share.all_link_count = 1;
   tmp_share.link_statuses = &tmp_link_statuses;
@@ -358,7 +358,7 @@ int spider_trx_all_unlock_tables(
   ha_spider tmp_spider;
   DBUG_ENTER("spider_trx_all_unlock_tables");
   SPIDER_BACKUP_DASTATUS;
-  memset(&tmp_spider, 0, sizeof(ha_spider));
+  memset((void*)&tmp_spider, 0, sizeof(ha_spider));
   tmp_spider.conns = &conn;
   tmp_spider.need_mons = &need_mon;
   while ((conn = (SPIDER_CONN*) my_hash_element(&trx->trx_conn_hash,
@@ -386,7 +386,7 @@ int spider_trx_all_start_trx(
   ha_spider tmp_spider;
   DBUG_ENTER("spider_trx_all_start_trx");
   SPIDER_BACKUP_DASTATUS;
-  memset(&tmp_spider, 0, sizeof(ha_spider));
+  memset((void*)&tmp_spider, 0, sizeof(ha_spider));
   tmp_spider.trx = trx;
   tmp_spider.need_mons = &need_mon;
   while ((conn = (SPIDER_CONN*) my_hash_element(&trx->trx_conn_hash,
@@ -421,7 +421,7 @@ int spider_trx_all_flush_logs(
   long net_write_timeout = 600;
   DBUG_ENTER("spider_trx_all_flush_logs");
   SPIDER_BACKUP_DASTATUS;
-  memset(&tmp_spider, 0, sizeof(ha_spider));
+  memset((void*)&tmp_spider, 0, sizeof(ha_spider));
   tmp_share.link_count = 1;
   tmp_share.all_link_count = 1;
   tmp_share.link_statuses = &tmp_link_statuses;