diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-02-15 01:39:37 +0530 |
|---|---|---|
| committer | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-03-16 21:11:21 +0530 |
| commit | e15a5ca9e89153db7cc9ce978bb789a4038b7c25 (patch) | |
| tree | 9c33fb2d815210f032e887af5da0f28c9d8c5301 /storage/innobase | |
| parent | a1542f8a57390bbad916ddfd335e1c751ffb3de5 (diff) | |
| download | mariadb-git-e15a5ca9e89153db7cc9ce978bb789a4038b7c25.tar.gz | |
MDEV-8334: Rename utf8 to utf8mb310.6-rucha-mdev-8334
This patch changes the main name of 3 byte character set from utf8 to
utf8mb3. New old_mode UTF8_IS_UTF8MB3 is added and set TRUE by default,
so that utf8 would mean utf8mb3. If not set, utf8 would mean utf8mb4.
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/fts/fts0opt.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/fts/fts0opt.cc b/storage/innobase/fts/fts0opt.cc index e5164fcc4fa..a26a05c2cf9 100644 --- a/storage/innobase/fts/fts0opt.cc +++ b/storage/innobase/fts/fts0opt.cc @@ -330,7 +330,7 @@ fts_word_t* fts_word_init( /*==========*/ fts_word_t* word, /*!< in: word to initialize */ - byte* utf8, /*!< in: UTF-8 string */ + byte* utf8mb3, /*!< in: UTF-8 string */ ulint len) /*!< in: length of string in bytes */ { mem_heap_t* heap = mem_heap_create(sizeof(fts_node_t)); @@ -341,7 +341,7 @@ fts_word_init( word->text.f_str = static_cast<byte*>(mem_heap_alloc(heap, len + 1)); /* Need to copy the NUL character too. */ - memcpy(word->text.f_str, utf8, word->text.f_len); + memcpy(word->text.f_str, utf8mb3, word->text.f_len); word->text.f_str[word->text.f_len] = 0; word->heap_alloc = ib_heap_allocator_create(heap); |