Skip to content

Commit 519f351

Browse files
committed
Bug#36353447 No public symbol mysql::collation::find_by_id()
Include the mysql::collation namespace in the implementation of find_by_id(). Add a find_by_id() test to libstrings_shared-t and libstrings_static-t. Change-Id: Ifdae1e2a208d9846d8968e9323c7f21c59340014
1 parent f5e1fd6 commit 519f351

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

strings/collations.cc

+3-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,9 @@ const CHARSET_INFO *mysql::collation::find_by_name(const Name &name) {
113113
return entry()->find_by_name(name);
114114
}
115115

116-
const CHARSET_INFO *find_by_id(unsigned id) { return entry()->find_by_id(id); }
116+
const CHARSET_INFO *mysql::collation::find_by_id(unsigned id) {
117+
return entry()->find_by_id(id);
118+
}
117119

118120
const CHARSET_INFO *mysql::collation::find_primary(Name cs_name) {
119121
// Needed by lexer, to parse e.g. "select _utf8 0xD0B0D0B1D0B2;"

unittest/examples/libstrings-t.cc

+2
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ int main() {
4747
mysql::collation::find_by_name("utf8mb4_zh_0900_as_cs");
4848
std::cout << "Ok: " << zh_cs->csname << " " << zh_cs->m_coll_name
4949
<< std::endl;
50+
const CHARSET_INFO *cs_id = mysql::collation::find_by_id(cs->number);
51+
std::cout << "OK: " << cs_id->csname << " " << cs_id->number << std::endl;
5052
mysql::collation::shutdown();
5153
return 0;
5254
}

0 commit comments

Comments
 (0)