summaryrefslogtreecommitdiff
path: root/sql/event_db_repository.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2022-10-12 14:43:53 +0400
committerAlexander Barkov <bar@mariadb.com>2022-10-13 18:45:30 +0400
commit14703a4f0fdb17ce6f2f657dc0af3da5848d9e22 (patch)
tree26a040a1621cc8c54e835a51582f24aec46f67e6 /sql/event_db_repository.cc
parentd66f6f0cb464d40077dd0a91d55ef3e2179b3e6b (diff)
downloadmariadb-git-14703a4f0fdb17ce6f2f657dc0af3da5848d9e22.tar.gz
MDEV-29776 collation_connection and db_collation are too short in mysql.proc and mysql.event
Increasing the data type from char(32) to char(64) for the following system columns: - mysql.event.collation_connection - mysql.event.db_collation - mysql.proc.collation_connection - mysql.proc.db_collation This change was forgotten during MDEV-27009. Also fixing the comment "Start/End of 10.9 tests" in ctype_utf8_uca.test to "Start/End of 10.10 tests", as MDEV-27009 was actually released in 10.10.
Diffstat (limited to 'sql/event_db_repository.cc')
-rw-r--r--sql/event_db_repository.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/event_db_repository.cc b/sql/event_db_repository.cc
index cf27e9b7326..9e31ccb3338 100644
--- a/sql/event_db_repository.cc
+++ b/sql/event_db_repository.cc
@@ -150,12 +150,12 @@ const TABLE_FIELD_TYPE event_table_fields[ET_FIELD_COUNT] =
},
{
{ STRING_WITH_LEN("collation_connection") },
- { STRING_WITH_LEN("char(32)") },
+ { STRING_WITH_LEN("char(") },
{ STRING_WITH_LEN("utf8mb3") }
},
{
{ STRING_WITH_LEN("db_collation") },
- { STRING_WITH_LEN("char(32)") },
+ { STRING_WITH_LEN("char(") },
{ STRING_WITH_LEN("utf8mb3") }
},
{