diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-30 07:31:39 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-30 07:31:39 +0200 |
| commit | 0ccfdc8eff6371941d07c61c273784cbc350c87e (patch) | |
| tree | eec9ea2d5b702035e8817072b67bb4f991dd699c /storage/innobase/fts/fts0fts.cc | |
| parent | 7440e61a64489a7eba9d0384366ab7aad99efe30 (diff) | |
| download | mariadb-git-0ccfdc8eff6371941d07c61c273784cbc350c87e.tar.gz | |
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.
Diffstat (limited to 'storage/innobase/fts/fts0fts.cc')
| -rw-r--r-- | storage/innobase/fts/fts0fts.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc index adeda4c9487..c248726913a 100644 --- a/storage/innobase/fts/fts0fts.cc +++ b/storage/innobase/fts/fts0fts.cc @@ -371,7 +371,7 @@ fts_load_default_stopword( new_word.nodes = ib_vector_create( allocator, sizeof(fts_node_t), 4); - str.f_len = ut_strlen(word); + str.f_len = strlen(word); str.f_str = reinterpret_cast<byte*>(word); fts_string_dup(&new_word.text, &str, heap); @@ -5717,7 +5717,7 @@ fts_is_aux_table_name( char my_name[MAX_FULL_NAME_LEN + 1]; ut_ad(len <= MAX_FULL_NAME_LEN); - ut_memcpy(my_name, name, len); + memcpy(my_name, name, len); my_name[len] = 0; end = my_name + len; @@ -7036,11 +7036,7 @@ fts_valid_stopword_table( return(NULL); } else { - const char* col_name; - - col_name = dict_table_get_col_name(table, 0); - - if (ut_strcmp(col_name, "value")) { + if (strcmp(dict_table_get_col_name(table, 0), "value")) { ib::error() << "Invalid column name for stopword" " table " << stopword_table_name << ". Its" " first column must be named as 'value'."; @@ -7167,7 +7163,7 @@ fts_load_stopword( if (!reload) { str.f_n_char = 0; str.f_str = (byte*) stopword_to_use; - str.f_len = ut_strlen(stopword_to_use); + str.f_len = strlen(stopword_to_use); error = fts_config_set_value( trx, &fts_table, FTS_STOPWORD_TABLE_NAME, &str); |