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 /sql/event_data_objects.cc | |
| parent | a1542f8a57390bbad916ddfd335e1c751ffb3de5 (diff) | |
| download | mariadb-git-10.6-rucha-mdev-8334.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 'sql/event_data_objects.cc')
| -rw-r--r-- | sql/event_data_objects.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc index 91d1d871307..8d3058ed5bc 100644 --- a/sql/event_data_objects.cc +++ b/sql/event_data_objects.cc @@ -129,7 +129,7 @@ Event_creation_ctx::load_from_db(THD *thd, invalid_creation_ctx= TRUE; } - if (load_collation(event_mem_root, + if (load_collation(thd, event_mem_root, event_tbl->field[ET_FIELD_COLLATION_CONNECTION], thd->variables.collation_connection, &connection_cl)) @@ -142,7 +142,7 @@ Event_creation_ctx::load_from_db(THD *thd, invalid_creation_ctx= TRUE; } - if (load_collation(event_mem_root, + if (load_collation(thd, event_mem_root, event_tbl->field[ET_FIELD_DB_COLLATION], NULL, &db_cl)) |