few cmake/compiler warnings

4 files changed, 4 insertions, 7 deletions

diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
index 6cd9b287262..9826c2d62f9 100644
--- a/libmysql/CMakeLists.txt
+++ b/libmysql/CMakeLists.txt
@@ -142,7 +142,6 @@ SET(CLIENT_SOURCES
   ../sql-common/my_time.c 
   ../sql-common/client_plugin.c 
   ../sql/net_serv.cc
-  ../sql-common/client_plugin.c 
   ../sql-common/pack.c 
   ../sql/password.c
 )
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
index 2b3b9b4347f..890f813da73 100644
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -83,11 +83,10 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
            ../sql/sql_alter.cc ../sql/sql_partition_admin.cc
            ../sql/event_parse_data.cc
            ../sql/sql_signal.cc ../sql/rpl_handler.cc
-	       ../sql/rpl_utility.cc
            ../sql/sys_vars.cc
            ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc
            ../sql/mdl.cc ../sql/transaction.cc
-           ../sql-common/client_plugin.c ../sql/sql_join_cache.cc
+           ../sql/sql_join_cache.cc
            ../sql/multi_range_read.cc
            ../sql/opt_index_cond_pushdown.cc
            ../sql/opt_subselect.cc
diff --git a/sql/debug_sync.cc b/sql/debug_sync.cc
index 093650b3673..eb8e3b093c9 100644
--- a/sql/debug_sync.cc
+++ b/sql/debug_sync.cc
@@ -1738,7 +1738,7 @@ static void debug_sync_execute(THD *thd, st_debug_sync_action *action)
     if (action->wait_for.length())
     {
       mysql_mutex_t *old_mutex;
-      mysql_cond_t  *old_cond;
+      mysql_cond_t  *UNINIT_VAR(old_cond);
       int             error= 0;
       struct timespec abstime;
 
diff --git a/storage/myisam/mi_open.c b/storage/myisam/mi_open.c
index 0adffcf4c13..5c89120c156 100644
--- a/storage/myisam/mi_open.c
+++ b/storage/myisam/mi_open.c
@@ -75,15 +75,14 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
     key_parts,unique_key_parts,base_key_parts,fulltext_keys,uniques;
   char name_buff[FN_REFLEN], org_name[FN_REFLEN], index_name[FN_REFLEN],
        data_name[FN_REFLEN];
-  uchar *disk_cache, *disk_pos, *end_pos;
-  MI_INFO info,*m_info,*old_info;
+  uchar *UNINIT_VAR(disk_cache), *disk_pos, *end_pos;
+  MI_INFO info,*UNINIT_VAR(m_info),*old_info;
   MYISAM_SHARE share_buff,*share;
   ulong *rec_per_key_part= 0;
   my_off_t *key_root, *key_del;
   ulonglong max_key_file_length, max_data_file_length;
   DBUG_ENTER("mi_open");
 
-  LINT_INIT(m_info);
   kfile= -1;
   lock_error=1;
   errpos=0;