Fixed errors and warnings found by buildbot

mysql-test/r/lowercase_table2.result:
  Updated result
  (The change happend because we don't try to open the table anymore as part of create table)
mysql-test/suite/rpl/r/create_or_replace_mix.result:
  Fixed result file
mysql-test/suite/rpl/r/create_or_replace_row.result:
  Fixed result file
mysql-test/suite/rpl/r/create_or_replace_statement.result:
  Fixed result file
mysql-test/suite/rpl/t/create_or_replace.inc:
  Drop open temporary table
mysys/my_delete.c:
  Added missing newline
plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/user_lock.result:
  Fixed result
  (Lock names was before off by one. Was corrected by my previous patch)
sql/sql_select.cc:
  Fixed compiler warnings by adding missing casts
storage/connect/ha_connect.cc:
  Fixed compiler warnings
storage/innobase/os/os0file.cc:
  Fixed compiler warnings
storage/xtradb/btr/btr0btr.cc:
  Fixed compiler warnings
storage/xtradb/handler/ha_innodb.cc:
  removed not used function
strings/ctype-uca.c:
  Fixed compiler warnings
support-files/compiler_warnings.supp:
  Added suppression for warnings that are wrong or are not serious andthat we don't plan to fix.

14 files changed, 37 insertions, 19 deletions

diff --git a/mysql-test/r/lowercase_table2.result b/mysql-test/r/lowercase_table2.result
index 58b976413de..f75eed41d9f 100644
--- a/mysql-test/r/lowercase_table2.result
+++ b/mysql-test/r/lowercase_table2.result
@@ -274,7 +274,7 @@ Database	Table	In_use	Name_locked
 test	t_bug44738_uppercase	0	0
 # So attempt to create table with the same name should fail.
 create table t_bug44738_UPPERCASE (i int);
-ERROR HY000: Can't find file: './test/t_bug44738_uppercase.MYI' (errno: 2 "No such file or directory")
+ERROR 42S01: Table 't_bug44738_uppercase' already exists
 # And should succeed after FLUSH TABLES.
 flush tables;
 create table t_bug44738_UPPERCASE (i int);
diff --git a/mysql-test/suite/rpl/r/create_or_replace_mix.result b/mysql-test/suite/rpl/r/create_or_replace_mix.result
index 096379c13ea..99de4ba729d 100644
--- a/mysql-test/suite/rpl/r/create_or_replace_mix.result
+++ b/mysql-test/suite/rpl/r/create_or_replace_mix.result
@@ -158,5 +158,5 @@ slave-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
 slave-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 slave-bin.000001	#	Xid	#	#	COMMIT /* XID */
 drop table t1;
-drop table t2;
+drop table t2,t3;
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/create_or_replace_row.result b/mysql-test/suite/rpl/r/create_or_replace_row.result
index beb4976953e..7c3a27573e5 100644
--- a/mysql-test/suite/rpl/r/create_or_replace_row.result
+++ b/mysql-test/suite/rpl/r/create_or_replace_row.result
@@ -180,5 +180,5 @@ slave-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
 slave-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 slave-bin.000001	#	Xid	#	#	COMMIT /* XID */
 drop table t1;
-drop table t2;
+drop table t2,t3;
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/create_or_replace_statement.result b/mysql-test/suite/rpl/r/create_or_replace_statement.result
index de139ff0f7b..f5d77a0f697 100644
--- a/mysql-test/suite/rpl/r/create_or_replace_statement.result
+++ b/mysql-test/suite/rpl/r/create_or_replace_statement.result
@@ -140,5 +140,5 @@ slave-bin.000001	#	Query	#	#	use `test`; create table t2 engine=myisam select *
 slave-bin.000001	#	Gtid	#	#	GTID #-#-#
 slave-bin.000001	#	Query	#	#	use `test`; create or replace table t2 engine=innodb select * from t1
 drop table t1;
-drop table t2;
+drop table t2,t3;
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/create_or_replace.inc b/mysql-test/suite/rpl/t/create_or_replace.inc
index 8cabd8f12bf..dad705403ed 100644
--- a/mysql-test/suite/rpl/t/create_or_replace.inc
+++ b/mysql-test/suite/rpl/t/create_or_replace.inc
@@ -132,6 +132,6 @@ connection server_1;
 drop table t1;
 
 # Clean up
-drop table t2;
+drop table t2,t3;
 
 --source include/rpl_end.inc
diff --git a/mysys/my_delete.c b/mysys/my_delete.c
index c1a821e90c2..e99c7ff5fcb 100644
--- a/mysys/my_delete.c
+++ b/mysys/my_delete.c
@@ -150,4 +150,4 @@ error:
   my_osmaperr(last_error);
   DBUG_RETURN(-1);
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/user_lock.result b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/user_lock.result
index 9e3779e0336..e1d690b566c 100644
--- a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/user_lock.result
+++ b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/user_lock.result
@@ -5,7 +5,7 @@ GET_LOCK('LOCK1',0)
 1
 SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
 lock_mode	lock_duration	lock_type	table_schema	table_name
-MDL_SHARED_NO_READ_WRITE	MDL_EXPLICIT	User lock	LOCK1	
+MDL_SHARED_NO_WRITE	MDL_EXPLICIT	User lock	LOCK1	
 SELECT RELEASE_LOCK('LOCK1');
 RELEASE_LOCK('LOCK1')
 1
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 5c2c9ba1e38..332230e67dc 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -8252,7 +8252,8 @@ get_best_combination(JOIN *join)
            sub-order
       */
       SJ_MATERIALIZATION_INFO *sjm= cur_pos->table->emb_sj_nest->sj_mat_info;
-      j->records= j->records_read= (ha_rows)(sjm->is_sj_scan? sjm->rows : 1);
+      j->records_read= (sjm->is_sj_scan? sjm->rows : 1);
+      j->records= (ha_rows) j->records_read;
       j->cond_selectivity= 1.0;
       JOIN_TAB *jt;
       JOIN_TAB_RANGE *jt_range;
@@ -11152,7 +11153,7 @@ ha_rows JOIN_TAB::get_examined_rows()
   else
     examined_rows= records_read;
 
-  return examined_rows;
+  return (ha_rows) examined_rows;
 }
 
 
@@ -23306,7 +23307,7 @@ int JOIN::save_explain_data_intern(Explain_query *output, bool need_tmp_table,
         double examined_rows= tab->get_examined_rows();
 
         eta->rows_set= true;
-        eta->rows= examined_rows;
+        eta->rows= (ha_rows) examined_rows;
 
         /* "filtered"  */
         float f= 0.0; 
diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc
index bec953819e7..29ca6321bba 100644
--- a/storage/connect/ha_connect.cc
+++ b/storage/connect/ha_connect.cc
@@ -2655,8 +2655,8 @@ int ha_connect::info(uint flag)
 
   if (flag & HA_STATUS_CONST) {
     // This is imported from the previous handler and must be reconsidered
-    stats.max_data_file_length= 4294967295;
-    stats.max_index_file_length= 4398046510080;
+    stats.max_data_file_length= 4294967295LL;
+    stats.max_index_file_length= 4398046510080LL;
     stats.create_time= 0;
     data_file_name= xinfo.data_file_name;
     index_file_name= NULL;
@@ -3895,7 +3895,7 @@ static int connect_assisted_discovery(handlerton *hton, THD* thd,
                                       TABLE_SHARE *table_s,
                                       HA_CREATE_INFO *create_info)
 {
-  char        v, spc= ',', qch= 0;
+  char        v=0, spc= ',', qch= 0;
   const char *fncn= "?";
   const char *user, *fn, *db, *host, *pwd, *sep, *tbl, *src;
   const char *col, *ocl, *rnk, *pic, *fcl;
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
index d9c6e43ee14..c76c3067d08 100644
--- a/storage/innobase/os/os0file.cc
+++ b/storage/innobase/os/os0file.cc
@@ -2096,7 +2096,7 @@ os_file_set_size(
 			fprintf(stderr, "InnoDB: Error: preallocating file "
 				"space for file \'%s\' failed.  Current size "
 				"%lu, desired size %lu\n",
-				name, current_size, size);
+				name, (long unsigned) current_size, (long unsigned) size);
 			os_file_handle_error_no_exit(name, "posix_fallocate", FALSE);
 			return(FALSE);
 		}
diff --git a/storage/xtradb/btr/btr0btr.cc b/storage/xtradb/btr/btr0btr.cc
index 569dcea072a..78f6d661560 100644
--- a/storage/xtradb/btr/btr0btr.cc
+++ b/storage/xtradb/btr/btr0btr.cc
@@ -805,7 +805,7 @@ btr_height_get(
         /* S latches the page */
         root_block = btr_root_block_get(index, RW_S_LATCH, mtr);
 
-        height = btr_page_get_level(buf_block_get_frame(root_block), mtr);
+        height = btr_page_get_level(buf_block_get_frame_fast(root_block), mtr);
 
         /* Release the S latch on the root page. */
         mtr_memo_release(mtr, root_block, MTR_MEMO_PAGE_S_FIX);
@@ -2746,7 +2746,7 @@ btr_attach_half_pages(
 	}
 
 	/* Get the level of the split pages */
-	level = btr_page_get_level(buf_block_get_frame(block), mtr);
+	level = btr_page_get_level(buf_block_get_frame_fast(block), mtr);
 	ut_ad(level
 	      == btr_page_get_level(buf_block_get_frame(new_block), mtr));
 
@@ -3970,8 +3970,8 @@ btr_discard_page(
 
 	/* Decide the page which will inherit the locks */
 
-	left_page_no = btr_page_get_prev(buf_block_get_frame(block), mtr);
-	right_page_no = btr_page_get_next(buf_block_get_frame(block), mtr);
+	left_page_no = btr_page_get_prev(buf_block_get_frame_fast(block), mtr);
+	right_page_no = btr_page_get_next(buf_block_get_frame_fast(block), mtr);
 
 	if (left_page_no != FIL_NULL) {
 		merge_block = btr_block_get(space, zip_size, left_page_no,
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
index c18cab7510e..43a99cafb64 100644
--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
@@ -1230,6 +1230,7 @@ normalize_table_name_low(
 	ibool           set_lower_case); /* in: TRUE if we want to set
 					 name to lower case */
 
+#ifdef NOT_USED
 /*************************************************************//**
 Removes old archived transaction log files.
 @return	true on error */
@@ -1255,6 +1256,7 @@ static bool innobase_purge_archive_logs(
 	}
 	return (err != DB_SUCCESS);
 }
+#endif
 
 /*************************************************************//**
 Check for a valid value of innobase_commit_concurrency.
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c
index 87c441bf40b..02b3334a0c7 100644
--- a/strings/ctype-uca.c
+++ b/strings/ctype-uca.c
@@ -22467,7 +22467,7 @@ wstr_to_str(char *str, size_t length, my_wc_t *wc, size_t wlength)
 
 static void
 my_charset_loader_error_for_rule(MY_CHARSET_LOADER *loader, 
-                                 const MY_COLL_RULE *r,
+                                 const MY_COLL_RULE *r __attribute__((unused)),
                                  const char *name,
                                  my_wc_t *wc, size_t wlength)
 {
diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp
index ef8d68a09d2..de390839704 100644
--- a/support-files/compiler_warnings.supp
+++ b/support-files/compiler_warnings.supp
@@ -52,6 +52,12 @@ log/log0log\.c : passing arg 1 of `atomic_add_64_nv' from incompatible pointer t
 log/log0online\.c : passing arg 1 of `atomic_add_64_nv' from incompatible pointer type
 
 #
+# Xtradb engine
+#
+storage/xtradb/handler/ha_innodb\.cc: ignoring return value of
+storage/xtradb/row/row0log\.cc: ignoring return value of
+
+#
 # bdb is not critical to keep up to date
 #
 .*/bdb/.* : .*discards qualifiers from pointer target type.*
@@ -172,6 +178,15 @@ vio/viosslfactories\.c: discards ~const~ qualifier from pointer target type
 # jemalloc
 #
 jemalloc/src/jemalloc\.c: always_inline function might not be inlinable
+jemalloc/src/jemalloc\.c: set but not used
+
+#
+# Connect engine
+#
+storage/connect/connect\.cc: might be clobbered by ~longjmp~
+storage/connect/filamvct\.cpp: ignoring return value of
+storage/connect/filamvct\.cpp: might be clobbered by ~longjmp~
+storage/connect/xindex\.cpp: ignoring return value of
 
 #
 # Unexplanable (?) stuff