diff options
Diffstat (limited to 'sql/sql_schema.h')
| -rw-r--r-- | sql/sql_schema.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sql/sql_schema.h b/sql/sql_schema.h index 7c8f284d526..886a115cbc5 100644 --- a/sql/sql_schema.h +++ b/sql/sql_schema.h @@ -47,18 +47,8 @@ public: */ bool eq_name(const LEX_CSTRING &name) const { -#if MYSQL_VERSION_ID > 100500 -#error Remove the old code return !table_alias_charset->strnncoll(m_name.str, m_name.length, name.str, name.length); -#else - // Please remove this when merging to 10.5 - return !table_alias_charset->coll->strnncoll(table_alias_charset, - (const uchar *) m_name.str, - m_name.length, - (const uchar *) name.str, - name.length, FALSE); -#endif } static Schema *find_by_name(const LEX_CSTRING &name); static Schema *find_implied(THD *thd); |