Remove InnoDB wrappers of <string.h> functions

ut_strcmp(), ut_strcpy(), ut_strlen(), ut_memcpy(), ut_memcmp(),
ut_memmove(): Remove. Invoke the standard library functions directly.

4 files changed, 15 insertions, 15 deletions

diff --git a/storage/innobase/pars/lexyy.cc b/storage/innobase/pars/lexyy.cc
index 16e7e47069e..0054e1c34d0 100644
--- a/storage/innobase/pars/lexyy.cc
+++ b/storage/innobase/pars/lexyy.cc
@@ -1977,7 +1977,7 @@ YY_RULE_SETUP
 {
 			yylval = sym_tab_add_id(pars_sym_tab_global,
 							(byte*) yytext,
-							ut_strlen(yytext));
+							strlen(yytext));
 			return(PARS_ID_TOKEN);
 }
 	YY_BREAK
@@ -1987,7 +1987,7 @@ YY_RULE_SETUP
 {
 			yylval = sym_tab_add_id(pars_sym_tab_global,
 							(byte*) yytext,
-							ut_strlen(yytext));
+							strlen(yytext));
 			return(PARS_TABLE_NAME_TOKEN);
 }
 	YY_BREAK
diff --git a/storage/innobase/pars/pars0lex.l b/storage/innobase/pars/pars0lex.l
index 2d0e56f400d..080e6de5120 100644
--- a/storage/innobase/pars/pars0lex.l
+++ b/storage/innobase/pars/pars0lex.l
@@ -560,14 +560,14 @@ In the state 'id', only two actions are possible (defined below). */
 {ID}		{
 			yylval = sym_tab_add_id(pars_sym_tab_global,
 							(byte*) yytext,
-							ut_strlen(yytext));
+							strlen(yytext));
 			return(PARS_ID_TOKEN);
 }
 
 {TABLE_NAME}	{
 			yylval = sym_tab_add_id(pars_sym_tab_global,
 							(byte*) yytext,
-							ut_strlen(yytext));
+							strlen(yytext));
 			return(PARS_TABLE_NAME_TOKEN);
 }
 
diff --git a/storage/innobase/pars/pars0opt.cc b/storage/innobase/pars/pars0opt.cc
index 0cfd93d4120..3730879146d 100644
--- a/storage/innobase/pars/pars0opt.cc
+++ b/storage/innobase/pars/pars0opt.cc
@@ -1,6 +1,7 @@
 /*****************************************************************************
 
 Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 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
@@ -584,8 +585,8 @@ opt_search_plan_for_table(
 			best_goodness = goodness;
 			n_fields = opt_calc_n_fields_from_goodness(goodness);
 
-			ut_memcpy(best_index_plan, index_plan,
-				  n_fields * sizeof(void*));
+			memcpy(best_index_plan, index_plan,
+			       n_fields * sizeof *index_plan);
 			best_last_op = last_op;
 		}
 
@@ -609,8 +610,8 @@ opt_search_plan_for_table(
 				pars_sym_tab_global->heap,
 				n_fields * sizeof(void*)));
 
-		ut_memcpy(plan->tuple_exps, best_index_plan,
-			  n_fields * sizeof(void*));
+		memcpy(plan->tuple_exps, best_index_plan,
+		       n_fields * sizeof *best_index_plan);
 		if (best_last_op == '='
 		    || best_last_op == PARS_LIKE_TOKEN_EXACT
                     || best_last_op == PARS_LIKE_TOKEN_PREFIX
diff --git a/storage/innobase/pars/pars0pars.cc b/storage/innobase/pars/pars0pars.cc
index 062cb5ae1d2..f9ce3a2ebea 100644
--- a/storage/innobase/pars/pars0pars.cc
+++ b/storage/innobase/pars/pars0pars.cc
@@ -640,9 +640,8 @@ pars_resolve_exp_variables_and_types(
 			|| (node->token_type == SYM_CURSOR)
 			|| (node->token_type == SYM_FUNCTION))
 		    && node->name
-		    && (sym_node->name_len == node->name_len)
-		    && (ut_memcmp(sym_node->name, node->name,
-				  node->name_len) == 0)) {
+		    && sym_node->name_len == node->name_len
+		    && !memcmp(sym_node->name, node->name, node->name_len)) {
 
 			/* Found a variable or a cursor declared with
 			the same name */
@@ -750,9 +749,9 @@ pars_resolve_exp_columns(
 			const char*		col_name
 				= dict_table_get_col_name(table, i);
 
-			if ((sym_node->name_len == ut_strlen(col_name))
-			    && (0 == ut_memcmp(sym_node->name, col_name,
-					       sym_node->name_len))) {
+			if (sym_node->name_len == strlen(col_name)
+			    && !memcmp(sym_node->name, col_name,
+				       sym_node->name_len)) {
 				/* Found */
 				sym_node->resolved = TRUE;
 				sym_node->token_type = SYM_COLUMN;
@@ -871,7 +870,7 @@ pars_select_all_columns(
 
 			col_node = sym_tab_add_id(pars_sym_tab_global,
 						  (byte*) col_name,
-						  ut_strlen(col_name));
+						  strlen(col_name));
 
 			select_node->select_list = que_node_list_add_last(
 				select_node->select_list, col_node);