Fixed compiler failures and warnings

4 files changed, 12 insertions, 21 deletions

diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index b9fd3ef171c..476981023fd 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -165,7 +165,8 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
     arg_length= header_length;
   }
 
-  result= dispatch_command(command, thd, (char *) arg, arg_length, FALSE);
+  result= dispatch_command(command, thd, (char *) arg, arg_length, FALSE,
+                           FALSE);
   thd->cur_data= 0;
   thd->mysys_var= NULL;
 
diff --git a/sql/bounded_queue.h b/sql/bounded_queue.h
index 2d4e6cff96d..88c2bbc238d 100644
--- a/sql/bounded_queue.h
+++ b/sql/bounded_queue.h
@@ -16,11 +16,11 @@
 #ifndef BOUNDED_QUEUE_INCLUDED
 #define BOUNDED_QUEUE_INCLUDED
 
-#include <string.h>
 #include "my_global.h"
 #include "my_base.h"
 #include "my_sys.h"
 #include "queues.h"
+#include <string.h>
 
 class Sort_param;
 
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 32999341691..9b70c4127f9 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -786,16 +786,6 @@ innobase_map_isolation_level(
 /*=========================*/
 	enum_tx_isolation	iso);	/*!< in: MySQL isolation level code */
 
-/******************************************************************//**
-Maps a MySQL trx isolation level code to the InnoDB isolation level code
-@return	InnoDB isolation level */
-static inline
-ulint
-innobase_map_isolation_level(
-/*=========================*/
-	enum_tx_isolation	iso);	/*!< in: MySQL isolation level code
-					*/
-
 /*************************************************************//**
 Check for a valid value of innobase_compression_algorithm.
 @return	0 for valid innodb_compression_algorithm. */
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
index 517f7aa2636..29b02ee5e55 100644
--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
@@ -8318,7 +8318,7 @@ ha_innobase::write_row(
 	if (share->ib_table != prebuilt->table) {
 		fprintf(stderr,
 			"InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.",
-			share->ib_table, prebuilt->table, prebuilt->table->name, prebuilt->table->is_corrupt);
+			share->ib_table, prebuilt->table, prebuilt->table->name, (int) prebuilt->table->is_corrupt);
 	}
 
 	if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) {
@@ -8671,7 +8671,7 @@ func_exit:
 	if (share->ib_table != prebuilt->table) {
 		fprintf(stderr,
 			"InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.",
-			share->ib_table, prebuilt->table, prebuilt->table->name, prebuilt->table->is_corrupt);
+			share->ib_table, prebuilt->table, prebuilt->table->name, (int) prebuilt->table->is_corrupt);
 	}
 
 	if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) {
@@ -9091,7 +9091,7 @@ ha_innobase::update_row(
 	if (share->ib_table != prebuilt->table) {
 		fprintf(stderr,
 			"InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.",
-			share->ib_table, prebuilt->table, prebuilt->table->name, prebuilt->table->is_corrupt);
+			share->ib_table, prebuilt->table, prebuilt->table->name, (int) prebuilt->table->is_corrupt);
 	}
 
 	if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) {
@@ -9212,7 +9212,7 @@ wsrep_error:
 	if (share->ib_table != prebuilt->table) {
 		fprintf(stderr,
 			"InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.",
-			share->ib_table, prebuilt->table, prebuilt->table->name, prebuilt->table->is_corrupt);
+			share->ib_table, prebuilt->table, prebuilt->table->name, (int) prebuilt->table->is_corrupt);
 	}
 
 	if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) {
@@ -12740,7 +12740,7 @@ ha_innobase::truncate()
 	if (share->ib_table != prebuilt->table) {
 		fprintf(stderr,
 			"InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.",
-			share->ib_table, prebuilt->table, prebuilt->table->name, prebuilt->table->is_corrupt);
+			share->ib_table, prebuilt->table, prebuilt->table->name, (int) prebuilt->table->is_corrupt);
 	}
 
 	if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) {
@@ -12761,7 +12761,7 @@ ha_innobase::truncate()
 	if (share->ib_table != prebuilt->table) {
 		fprintf(stderr,
 			"InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.",
-			share->ib_table, prebuilt->table, prebuilt->table->name, prebuilt->table->is_corrupt);
+			share->ib_table, prebuilt->table, prebuilt->table->name, (int) prebuilt->table->is_corrupt);
 	}
 
 	if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) {
@@ -14157,7 +14157,7 @@ ha_innobase::analyze(
 	if (share->ib_table != prebuilt->table) {
 		fprintf(stderr,
 			"InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.",
-			share->ib_table, prebuilt->table, prebuilt->table->name, prebuilt->table->is_corrupt);
+			share->ib_table, prebuilt->table, prebuilt->table->name, (int) prebuilt->table->is_corrupt);
 	}
 
 	if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) {
@@ -14173,7 +14173,7 @@ ha_innobase::analyze(
 	if (share->ib_table != prebuilt->table) {
 		fprintf(stderr,
 			"InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.",
-			share->ib_table, prebuilt->table, prebuilt->table->name, prebuilt->table->is_corrupt);
+			share->ib_table, prebuilt->table, prebuilt->table->name, (int) prebuilt->table->is_corrupt);
 	}
 
 	if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) {
@@ -15388,7 +15388,7 @@ ha_innobase::transactional_table_lock(
 	if (share->ib_table != prebuilt->table) {
 		fprintf(stderr,
 			"InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.",
-			share->ib_table, prebuilt->table, prebuilt->table->name, prebuilt->table->is_corrupt);
+			share->ib_table, prebuilt->table, prebuilt->table->name, (int) prebuilt->table->is_corrupt);
 	}
 
 	if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) {