Fix integer type mismatch

storage/innobase/handler/handler0alter.cc

@@ -3024,7 +3024,8 @@ innobase_build_col_map(
 		    == dict_table_get_n_cols(new_table));
 	DBUG_ASSERT(table->s->stored_fields > 0);
 
-	const size_t old_n_v_cols = table->s->fields - table->s->stored_fields;
+	const uint old_n_v_cols = uint(table->s->fields
+				       - table->s->stored_fields);
 	DBUG_ASSERT(old_n_v_cols == old_table->n_v_cols
 		    || table->s->frm_version < FRM_VER_EXPRESSSIONS);
 	DBUG_ASSERT(!old_n_v_cols || table->s->virtual_fields);

storage/innobase/include/pars0sym.h

 /*****************************************************************************
 
 Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2017, 2018, MariaDB Corporation.
+Copyright (c) 2017, 2019, MariaDB Corporation.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -224,7 +224,7 @@ struct sym_tab_t{
 					/*!< SQL string to parse */
 	size_t			string_len;
 					/*!< SQL string length */
-	int			next_char_pos;
+	size_t			next_char_pos;
 					/*!< position of the next character in
 					sql_string to give to the lexical
 					analyzer */

storage/innobase/pars/pars0pars.cc

@@ -2065,9 +2065,8 @@ pars_get_lex_chars(
 	size_t	max_size)	/*!< in: maximum number of characters which fit
 				in the buffer */
 {
-	size_t len = size_t(
-		pars_sym_tab_global->string_len
-		- pars_sym_tab_global->next_char_pos);
+	size_t len = pars_sym_tab_global->string_len
+		- pars_sym_tab_global->next_char_pos;
 	if (len == 0) {
 		return(0);
 	}
@@ -2076,8 +2075,8 @@ pars_get_lex_chars(
 		len = max_size;
 	}
 
-	ut_memcpy(buf, pars_sym_tab_global->sql_string
-		  + pars_sym_tab_global->next_char_pos, len);
+	memcpy(buf, pars_sym_tab_global->sql_string
+	       + pars_sym_tab_global->next_char_pos, len);
 
 	pars_sym_tab_global->next_char_pos += len;