Skip to content

M
mariadb
Commit 69f4b6a9 authored by unknown's avatar unknown
Browse files
Options

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs3
parents 41315876 4ab53435
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
sql/sql_table.cc
View file @ 69f4b6a9
...@@ -126,7 +126,7 @@ uint filename_to_tablename(const char *from, char *to, uint to_length) ...@@ -126,7 +126,7 @@ uint filename_to_tablename(const char *from, char *to, uint to_length)
uint tablename_to_filename(const char *from, char *to, uint to_length) uint tablename_to_filename(const char *from, char *to, uint to_length)
{ {
uint errors; uint errors;
if (from[0] && !strncmp(from, MYSQL50_TABLE_NAME_PREFIX, if (from[0] == '#' && !strncmp(from, MYSQL50_TABLE_NAME_PREFIX,
MYSQL50_TABLE_NAME_PREFIX_LENGTH)) MYSQL50_TABLE_NAME_PREFIX_LENGTH))
return my_snprintf(to, to_length, "%s", from + 9); return my_snprintf(to, to_length, "%s", from + 9);
return strconvert(system_charset_info, from, return strconvert(system_charset_info, from,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7