diff --git a/innobase/eval/eval0eval.c b/innobase/eval/eval0eval.c
index 053a10b3c23365f6f7487a81a28b67b3acdd8125..a3cd60b86ae9ed2a4bb7749fed984a5439158b9e 100644
--- a/innobase/eval/eval0eval.c
+++ b/innobase/eval/eval0eval.c
@@ -725,7 +725,7 @@ eval_predefined(
 				uint_val = (ulint) int_val;
 			}
 			for (tmp = int_len; uint_val > 0; uint_val /= 10) {
-				data[--tmp] = '0' + (uint_val % 10);
+				data[--tmp] = '0' + (byte)(uint_val % 10);
 			}
 		}
 
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index 4192df22e5c43a5e71433f0902754bc38b949409..872a6abef8bddc08855c87326605b16c9da2d67b 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -4780,7 +4780,6 @@ innodb_show_status(
 /*===============*/
 	THD*	thd)	/* in: the MySQL query thread of the caller */
 {
-        char*           buf;
         Protocol        *protocol= thd->protocol;
 	trx_t*		trx;