Skip to content

Commit 33c0bb0

Browse files
author
Tor Didriksen
committed
Bug #33773026 Rename CHARSET_INFO.name to m_coll_name
For better code readability/maintanability: Rename CHARSET_INFO.name to m_coll_name Rename the function get_charset_name() to get_collation_name(). Change-Id: Ia7c5579f44669d72cc6f982a4dbf02ae6e2d3588
1 parent 0660cdd commit 33c0bb0

File tree

103 files changed

+528
-491
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+528
-491
lines changed

‎client/mysql.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -3523,7 +3523,7 @@ static void print_field_types(MYSQL_RES *result) {
35233523
"Flags: %s\n\n",
35243524
++i, field->name, field->catalog, field->db, field->table,
35253525
field->org_table, fieldtype2str(field->type),
3526-
get_charset_name(field->charsetnr), field->charsetnr,
3526+
get_collation_name(field->charsetnr), field->charsetnr,
35273527
field->length, field->max_length, field->decimals,
35283528
fieldflags2str(field->flags));
35293529
}

‎client/mysqldump.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -1242,7 +1242,7 @@ static int switch_db_collation(FILE *sql_file, const char *db_name,
12421242
if (!db_cl) return 1;
12431243

12441244
fprintf(sql_file, "ALTER DATABASE %s CHARACTER SET %s COLLATE %s %s\n",
1245-
quoted_db_name, db_cl->csname, db_cl->name, delimiter);
1245+
quoted_db_name, db_cl->csname, db_cl->m_coll_name, delimiter);
12461246

12471247
*db_cl_altered = 1;
12481248

@@ -1264,7 +1264,7 @@ static int restore_db_collation(FILE *sql_file, const char *db_name,
12641264
if (!db_cl) return 1;
12651265

12661266
fprintf(sql_file, "ALTER DATABASE %s CHARACTER SET %s COLLATE %s %s\n",
1267-
quoted_db_name, db_cl->csname, db_cl->name, delimiter);
1267+
quoted_db_name, db_cl->csname, db_cl->m_coll_name, delimiter);
12681268

12691269
return 0;
12701270
}
@@ -3718,7 +3718,7 @@ static void dump_table(char *table, char *db) {
37183718
dynstr_append_checked(&query_string, " /*!50138 CHARACTER SET ");
37193719
dynstr_append_checked(&query_string,
37203720
default_charset == mysql_universal_client_charset
3721-
? my_charset_bin.name
3721+
? my_charset_bin.m_coll_name
37223722
: /* backward compatibility */
37233723
default_charset);
37243724
dynstr_append_checked(&query_string, " */");

‎include/m_ctype.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2000, 2021, Oracle and/or its affiliates.
1+
/* Copyright (c) 2000, 2022, Oracle and/or its affiliates.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License, version 2.0,
@@ -362,7 +362,7 @@ struct CHARSET_INFO {
362362
uint binary_number;
363363
uint state;
364364
const char *csname;
365-
const char *name;
365+
const char *m_coll_name;
366366
const char *comment;
367367
const char *tailoring;
368368
struct Coll_param *coll_param;

‎include/my_sys.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2000, 2021, Oracle and/or its affiliates.
1+
/* Copyright (c) 2000, 2022, Oracle and/or its affiliates.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License, version 2.0,
@@ -875,7 +875,7 @@ int my_msync(int, void *, size_t, int);
875875
extern void my_charset_loader_init_mysys(MY_CHARSET_LOADER *loader);
876876
extern uint get_charset_number(const char *cs_name, uint cs_flags);
877877
extern uint get_collation_number(const char *name);
878-
extern const char *get_charset_name(uint cs_number);
878+
extern const char *get_collation_name(uint cs_number);
879879

880880
extern CHARSET_INFO *get_charset(uint cs_number, myf flags);
881881
extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags);

‎libmysql/libmysql.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -968,7 +968,7 @@ void STDCALL mysql_get_character_set_info(MYSQL *mysql,
968968
csinfo->number = mysql->charset->number;
969969
csinfo->state = mysql->charset->state;
970970
csinfo->csname = mysql->charset->csname;
971-
csinfo->name = mysql->charset->name;
971+
csinfo->name = mysql->charset->m_coll_name;
972972
csinfo->comment = mysql->charset->comment;
973973
csinfo->mbminlen = mysql->charset->mbminlen;
974974
csinfo->mbmaxlen = mysql->charset->mbmaxlen;

‎mysql-test/r/myisam.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -2451,7 +2451,7 @@ Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, but wil
24512451

24522452
MyISAM file: MYSQLD_DATADIR/test/t1
24532453
Record format: Packed
2454-
Character set: utf8_general_ci (33)
2454+
Collation: utf8_general_ci (33)
24552455
Data records: 0 Deleted blocks: 0
24562456
Recordlength: 94
24572457

‎mysys/charset-def.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2000, 2021, Oracle and/or its affiliates.
1+
/* Copyright (c) 2000, 2022, Oracle and/or its affiliates.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License, version 2.0,
@@ -500,7 +500,8 @@ bool init_compiled_charsets(myf flags [[maybe_unused]]) {
500500
add_compiled_collation(&my_charset_utf32_vietnamese_ci);
501501

502502
/* Copy compiled charsets */
503-
for (cs = compiled_charsets; cs->name; cs++) add_compiled_collation(cs);
503+
for (cs = compiled_charsets; cs->m_coll_name; cs++)
504+
add_compiled_collation(cs);
504505

505506
return false;
506507
}

‎mysys/charset.cc

+16-14
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ static bool cs_copy_data(CHARSET_INFO *to, CHARSET_INFO *from) {
141141
if (to->csname == nullptr) return true;
142142
}
143143

144-
if (from->name) {
145-
to->name = my_once_strdup(from->name, MYF(MY_WME));
146-
if (to->name == nullptr) return true;
144+
if (from->m_coll_name) {
145+
to->m_coll_name = my_once_strdup(from->m_coll_name, MYF(MY_WME));
146+
if (to->m_coll_name == nullptr) return true;
147147
}
148148

149149
if (from->comment) {
@@ -194,7 +194,7 @@ static bool cs_copy_data(CHARSET_INFO *to, CHARSET_INFO *from) {
194194
static bool simple_cs_is_full(CHARSET_INFO *cs) {
195195
return ((cs->csname && cs->tab_to_uni && cs->ctype && cs->to_upper &&
196196
cs->to_lower) &&
197-
(cs->number && cs->name &&
197+
(cs->number && cs->m_coll_name &&
198198
(cs->sort_order || (cs->state & MY_CS_BINSORT))));
199199
}
200200

@@ -215,14 +215,15 @@ static void clear_cs_info(CHARSET_INFO *cs) {
215215
cs->number = 0;
216216
cs->primary_number = 0;
217217
cs->binary_number = 0;
218-
cs->name = nullptr;
218+
cs->m_coll_name = nullptr;
219219
cs->state = 0;
220220
cs->sort_order = nullptr;
221221
}
222222

223223
static int add_collation(CHARSET_INFO *cs) {
224-
if (cs->name &&
225-
(cs->number || (cs->number = get_collation_number_internal(cs->name))) &&
224+
if (cs->m_coll_name &&
225+
(cs->number ||
226+
(cs->number = get_collation_number_internal(cs->m_coll_name))) &&
226227
cs->number < array_elements(all_charsets)) {
227228
if (!all_charsets[cs->number]) {
228229
if (!(all_charsets[cs->number] =
@@ -240,7 +241,7 @@ static int add_collation(CHARSET_INFO *cs) {
240241
if (cs->binary_number == cs->number) cs->state |= MY_CS_BINSORT;
241242

242243
all_charsets[cs->number]->state |= cs->state;
243-
map_coll_name_to_number(cs->name, cs->number);
244+
map_coll_name_to_number(cs->m_coll_name, cs->number);
244245
map_cs_name_to_number(cs->csname, cs->number, cs->state);
245246

246247
if (!(all_charsets[cs->number]->state & MY_CS_COMPILED)) {
@@ -298,7 +299,7 @@ static int add_collation(CHARSET_INFO *cs) {
298299
}
299300
} else {
300301
/*
301-
We need the below to make get_charset_name()
302+
We need the below to make get_collaiton_name()
302303
and get_charset_number() working even if a
303304
character set has not been really incompiled.
304305
The above functions are used for example
@@ -314,8 +315,8 @@ static int add_collation(CHARSET_INFO *cs) {
314315
if (cs->csname)
315316
if (!(dst->csname = my_once_strdup(cs->csname, MYF(MY_WME))))
316317
return MY_XML_ERROR;
317-
if (cs->name)
318-
if (!(dst->name = my_once_strdup(cs->name, MYF(MY_WME))))
318+
if (cs->m_coll_name)
319+
if (!(dst->m_coll_name = my_once_strdup(cs->m_coll_name, MYF(MY_WME))))
319320
return MY_XML_ERROR;
320321
}
321322
clear_cs_info(cs);
@@ -427,7 +428,7 @@ CHARSET_INFO *default_charset_info = &my_charset_latin1;
427428
void add_compiled_collation(CHARSET_INFO *cs) {
428429
assert(cs->number < array_elements(all_charsets));
429430
all_charsets[cs->number] = cs;
430-
map_coll_name_to_number(cs->name, cs->number);
431+
map_coll_name_to_number(cs->m_coll_name, cs->number);
431432
map_cs_name_to_number(cs->csname, cs->number, cs->state);
432433
cs->state |= MY_CS_AVAILABLE;
433434
}
@@ -528,13 +529,14 @@ uint get_charset_number(const char *charset_name, uint cs_flags) {
528529
return 0;
529530
}
530531

531-
const char *get_charset_name(uint charset_number) {
532+
const char *get_collation_name(uint charset_number) {
532533
std::call_once(charsets_initialized, init_available_charsets);
533534

534535
if (charset_number < array_elements(all_charsets)) {
535536
CHARSET_INFO *cs = all_charsets[charset_number];
536537

537-
if (cs && (cs->number == charset_number) && cs->name) return cs->name;
538+
if (cs && (cs->number == charset_number) && cs->m_coll_name)
539+
return cs->m_coll_name;
538540
}
539541

540542
return "?"; /* this mimics find_type() */

‎plugin/group_replication/src/sql_service/sql_service_context.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2015, 2021, Oracle and/or its affiliates.
1+
/* Copyright (c) 2015, 2022, Oracle and/or its affiliates.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License, version 2.0,
@@ -27,7 +27,7 @@
2727
int Sql_service_context::start_result_metadata(uint ncols, uint,
2828
const CHARSET_INFO *resultcs) {
2929
DBUG_TRACE;
30-
DBUG_PRINT("info", ("resultcs->name: %s", resultcs->name));
30+
DBUG_PRINT("info", ("resultcs->m_coll_name: %s", resultcs->m_coll_name));
3131
if (resultset) {
3232
resultset->set_cols(ncols);
3333
resultset->set_charset(resultcs);

‎plugin/test_service_sql_api/test_session_detach.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ static int sql_start_result_metadata(void *ctx, uint num_cols, uint,
167167
DBUG_TRACE;
168168
DBUG_PRINT("info", ("resultcs->number: %d", resultcs->number));
169169
DBUG_PRINT("info", ("resultcs->csname: %s", resultcs->csname));
170-
DBUG_PRINT("info", ("resultcs->name: %s", resultcs->name));
170+
DBUG_PRINT("info", ("resultcs->name: %s", resultcs->m_coll_name));
171171
pctx->num_cols = num_cols;
172172
pctx->resultcs = resultcs;
173173
pctx->current_col = 0;

‎plugin/test_service_sql_api/test_session_info.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ static int sql_start_result_metadata(void *ctx, uint num_cols, uint,
186186
DBUG_TRACE;
187187
DBUG_PRINT("info", ("resultcs->number: %d", resultcs->number));
188188
DBUG_PRINT("info", ("resultcs->csname: %s", resultcs->csname));
189-
DBUG_PRINT("info", ("resultcs->name: %s", resultcs->name));
189+
DBUG_PRINT("info", ("resultcs->name: %s", resultcs->m_coll_name));
190190
pctx->num_cols = num_cols;
191191
pctx->resultcs = resultcs;
192192
pctx->current_col = 0;

‎plugin/test_service_sql_api/test_sql_2_sessions.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ static int sql_start_result_metadata(void *ctx, uint num_cols, uint,
182182
DBUG_TRACE;
183183
DBUG_PRINT("info", ("resultcs->number: %d", resultcs->number));
184184
DBUG_PRINT("info", ("resultcs->csname: %s", resultcs->csname));
185-
DBUG_PRINT("info", ("resultcs->name: %s", resultcs->name));
185+
DBUG_PRINT("info", ("resultcs->name: %s", resultcs->m_coll_name));
186186
pctx->num_cols = num_cols;
187187
pctx->resultcs = resultcs;
188188
pctx->current_col = 0;

‎plugin/test_service_sql_api/test_sql_all_col_types.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ static int sql_start_result_metadata(void *ctx, uint num_cols, uint,
169169
DBUG_TRACE;
170170
DBUG_PRINT("info", ("resultcs->number: %d", resultcs->number));
171171
DBUG_PRINT("info", ("resultcs->csname: %s", resultcs->csname));
172-
DBUG_PRINT("info", ("resultcs->name: %s", resultcs->name));
172+
DBUG_PRINT("info", ("resultcs->name: %s", resultcs->m_coll_name));
173173
pctx->num_cols = num_cols;
174174
pctx->resultcs = resultcs;
175175
pctx->current_col = 0;

‎plugin/test_service_sql_api/test_sql_cmds_1.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ static int sql_start_result_metadata(void *, uint num_cols, uint,
160160
DBUG_TRACE;
161161
DBUG_PRINT("info", ("resultcs->number: %d", resultcs->number));
162162
DBUG_PRINT("info", ("resultcs->csname: %s", resultcs->csname));
163-
DBUG_PRINT("info", ("resultcs->name: %s", resultcs->name));
163+
DBUG_PRINT("info", ("resultcs->name: %s", resultcs->m_coll_name));
164164
row_count = 0;
165165
sql_num_cols = num_cols;
166166
sql_resultcs = resultcs;

‎plugin/test_service_sql_api/test_sql_commit.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ static int sql_start_result_metadata(void *ctx, uint num_cols, uint,
165165
DBUG_TRACE;
166166
DBUG_PRINT("info", ("resultcs->number: %d", resultcs->number));
167167
DBUG_PRINT("info", ("resultcs->csname: %s", resultcs->csname));
168-
DBUG_PRINT("info", ("resultcs->name: %s", resultcs->name));
168+
DBUG_PRINT("info", ("resultcs->m_coll_name: %s", resultcs->m_coll_name));
169169
pctx->num_cols = num_cols;
170170
pctx->resultcs = resultcs;
171171
pctx->current_col = 0;
@@ -549,7 +549,7 @@ static void dump_cs_info(const CHARSET_INFO *cs) {
549549

550550
WRITE_VAL("\t\t[meta][charset result] number: %d\n", cs->number);
551551
WRITE_VAL("\t\t[meta][charset result] name: %s\n", cs->csname);
552-
WRITE_VAL("\t\t[meta][charset result] collation: %s\n", cs->name);
552+
WRITE_VAL("\t\t[meta][charset result] collation: %s\n", cs->m_coll_name);
553553
WRITE_VAL("\t\t[meta][charset result] sort order: %s\n", cs->sort_order);
554554
}
555555

‎plugin/test_service_sql_api/test_sql_complex.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ static int sql_start_result_metadata(void *ctx, uint num_cols, uint,
245245
DBUG_TRACE;
246246
DBUG_PRINT("info", ("resultcs->number: %d", resultcs->number));
247247
DBUG_PRINT("info", ("resultcs->csname: %s", resultcs->csname));
248-
DBUG_PRINT("info", ("resultcs->name: %s", resultcs->name));
248+
DBUG_PRINT("info", ("resultcs->m_coll_name: %s", resultcs->m_coll_name));
249249
pctx->num_cols = num_cols;
250250
pctx->resultcs = resultcs;
251251
pctx->current_col = 0;
@@ -654,7 +654,7 @@ static void dump_cs_info(const CHARSET_INFO *cs) {
654654

655655
WRITE_VAL("\t\t[meta][charset result] number: %d\n", cs->number);
656656
WRITE_VAL("\t\t[meta][charset result] name: %s\n", cs->csname);
657-
WRITE_VAL("\t\t[meta][charset result] collation: %s\n", cs->name);
657+
WRITE_VAL("\t\t[meta][charset result] collation: %s\n", cs->m_coll_name);
658658
WRITE_VAL("\t\t[meta][charset result] sort order: %s\n", cs->sort_order);
659659
}
660660

‎plugin/test_service_sql_api/test_sql_errors.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ static int sql_start_result_metadata(void *ctx, uint num_cols, uint,
184184
DBUG_TRACE;
185185
DBUG_PRINT("info", ("resultcs->number: %d", resultcs->number));
186186
DBUG_PRINT("info", ("resultcs->csname: %s", resultcs->csname));
187-
DBUG_PRINT("info", ("resultcs->name: %s", resultcs->name));
187+
DBUG_PRINT("info", ("resultcs->m_coll_name: %s", resultcs->m_coll_name));
188188
pctx->num_cols = num_cols;
189189
pctx->resultcs = resultcs;
190190
pctx->current_col = 0;

‎plugin/test_service_sql_api/test_sql_lock.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ static int sql_start_result_metadata(void *ctx, uint num_cols, uint,
166166
DBUG_TRACE;
167167
DBUG_PRINT("info", ("resultcs->number: %d", resultcs->number));
168168
DBUG_PRINT("info", ("resultcs->csname: %s", resultcs->csname));
169-
DBUG_PRINT("info", ("resultcs->name: %s", resultcs->name));
169+
DBUG_PRINT("info", ("resultcs->m_coll_name: %s", resultcs->m_coll_name));
170170
pctx->num_cols = num_cols;
171171
pctx->resultcs = resultcs;
172172
pctx->current_col = 0;

‎plugin/test_service_sql_api/test_sql_processlist.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ static int sql_start_result_metadata(void *ctx, uint num_cols, uint,
178178
DBUG_TRACE;
179179
DBUG_PRINT("info", ("resultcs->number: %d", resultcs->number));
180180
DBUG_PRINT("info", ("resultcs->csname: %s", resultcs->csname));
181-
DBUG_PRINT("info", ("resultcs->name: %s", resultcs->name));
181+
DBUG_PRINT("info", ("resultcs->m_coll_name: %s", resultcs->m_coll_name));
182182
pctx->num_cols = num_cols;
183183
pctx->resultcs = resultcs;
184184
pctx->current_col = 0;

‎plugin/test_service_sql_api/test_sql_replication.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ static int sql_start_result_metadata(void *ctx, uint num_cols, uint,
165165
DBUG_TRACE;
166166
DBUG_PRINT("info", ("resultcs->number: %d", resultcs->number));
167167
DBUG_PRINT("info", ("resultcs->csname: %s", resultcs->csname));
168-
DBUG_PRINT("info", ("resultcs->name: %s", resultcs->name));
168+
DBUG_PRINT("info", ("resultcs->m_coll_name: %s", resultcs->m_coll_name));
169169
pctx->num_cols = num_cols;
170170
pctx->resultcs = resultcs;
171171
pctx->current_col = 0;
@@ -554,7 +554,7 @@ static void dump_cs_info(const CHARSET_INFO *cs) {
554554

555555
WRITE_VAL("\t\t[meta][charset result] number: %d\n", cs->number);
556556
WRITE_VAL("\t\t[meta][charset result] name: %s\n", cs->csname);
557-
WRITE_VAL("\t\t[meta][charset result] collation: %s\n", cs->name);
557+
WRITE_VAL("\t\t[meta][charset result] collation: %s\n", cs->m_coll_name);
558558
WRITE_VAL("\t\t[meta][charset result] sort order: %s\n", cs->sort_order);
559559
}
560560

‎plugin/test_service_sql_api/test_sql_reset_connection.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ static int sql_start_result_metadata(void *ctx, uint num_cols, uint,
146146
DBUG_TRACE;
147147
DBUG_PRINT("info", ("resultcs->number: %d", resultcs->number));
148148
DBUG_PRINT("info", ("resultcs->csname: %s", resultcs->csname));
149-
DBUG_PRINT("info", ("resultcs->name: %s", resultcs->name));
149+
DBUG_PRINT("info", ("resultcs->m_coll_name: %s", resultcs->m_coll_name));
150150
pctx->num_cols = num_cols;
151151
pctx->resultcs = resultcs;
152152
pctx->current_col = 0;

‎plugin/test_service_sql_api/test_sql_shutdown.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ static int sql_start_result_metadata(void *ctx, uint num_cols, uint,
166166
DBUG_TRACE;
167167
DBUG_PRINT("info", ("resultcs->number: %d", resultcs->number));
168168
DBUG_PRINT("info", ("resultcs->csname: %s", resultcs->csname));
169-
DBUG_PRINT("info", ("resultcs->name: %s", resultcs->name));
169+
DBUG_PRINT("info", ("resultcs->m_coll_name: %s", resultcs->m_coll_name));
170170
pctx->num_cols = num_cols;
171171
pctx->resultcs = resultcs;
172172
pctx->current_col = 0;

‎plugin/test_service_sql_api/test_sql_sleep_is_connected.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ static int sql_start_result_metadata(void *, uint, uint,
7575
DBUG_ENTER("sql_start_result_metadata");
7676
DBUG_PRINT("info", ("resultcs->number: %d", resultcs->number));
7777
DBUG_PRINT("info", ("resultcs->csname: %s", resultcs->csname));
78-
DBUG_PRINT("info", ("resultcs->name: %s", resultcs->name));
78+
DBUG_PRINT("info", ("resultcs->m_coll_name: %s", resultcs->m_coll_name));
7979
DBUG_RETURN(false);
8080
}
8181

‎plugin/test_service_sql_api/test_sql_sqlmode.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ static int sql_start_result_metadata(void *ctx, uint num_cols, uint,
220220
DBUG_TRACE;
221221
DBUG_PRINT("info", ("resultcs->number: %d", resultcs->number));
222222
DBUG_PRINT("info", ("resultcs->csname: %s", resultcs->csname));
223-
DBUG_PRINT("info", ("resultcs->name: %s", resultcs->name));
223+
DBUG_PRINT("info", ("resultcs->m_coll_name: %s", resultcs->m_coll_name));
224224
pctx->num_cols = num_cols;
225225
pctx->resultcs = resultcs;
226226
pctx->current_col = 0;
@@ -633,7 +633,7 @@ static void dump_cs_info(const CHARSET_INFO *cs) {
633633

634634
WRITE_VAL("\t\t[meta][charset result] number: %d\n", cs->number);
635635
WRITE_VAL("\t\t[meta][charset result] name: %s\n", cs->csname);
636-
WRITE_VAL("\t\t[meta][charset result] collation: %s\n", cs->name);
636+
WRITE_VAL("\t\t[meta][charset result] collation: %s\n", cs->m_coll_name);
637637
WRITE_VAL("\t\t[meta][charset result] sort order: %s\n", cs->sort_order);
638638
}
639639

0 commit comments

Comments
 (0)