diff options
author | unknown <dlenev@brandersnatch.localdomain> | 2004-05-22 23:41:58 +0400 |
---|---|---|
committer | unknown <dlenev@brandersnatch.localdomain> | 2004-05-22 23:41:58 +0400 |
commit | 0e86cf8aba3c7d067dd28efd78f138d467ec7e7b (patch) | |
tree | 396b746d77b997977420c7bc8c1903ab26a53a21 /sql/handler.cc | |
parent | 11ee33b181f20b3d746da871918c96890480a1ae (diff) | |
download | mariadb-git-0e86cf8aba3c7d067dd28efd78f138d467ec7e7b.tar.gz |
Fix for bug which caused grant.test fail on darwin7.3. We were converting db and table
names to lower case using latin1 instead of utf-8 in sql_acl.cc if lower_case_table_names
was on. Also replaced in other such places system_charset_info with files_charset_info
for consistency.
sql/handler.cc:
Replaced system_charset_info with files_charset_info in places where we are converting
names to lower case because of lower_case_table_names for consistency.
sql/sql_acl.cc:
We should use files_charset_info when converting db/table names to lower case because they
could be in utf-8 and not in latin1!
sql/sql_cache.cc:
Added clarifying comments in tricky place after discussion with Sanja.
Replaced system_charset_info with files_charset_info in places where we
are converting names to lower case because of lower_case_table_names for
consistency.
sql/sql_db.cc:
Replaced system_charset_info with files_charset_info in places where we are converting
names to lower case because of lower_case_table_names for consistency.
sql/sql_show.cc:
Replaced system_charset_info with files_charset_info in places where we are converting
names to lower case because of lower_case_table_names for consistency.
sql/sql_table.cc:
Replaced system_charset_info with files_charset_info in places where we are converting
names to lower case because of lower_case_table_names for consistency.
Diffstat (limited to 'sql/handler.cc')
-rw-r--r-- | sql/handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 9acd55db0b1..bc86241bd00 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -743,7 +743,7 @@ int ha_delete_table(enum db_type table_type, const char *path) { /* Ensure that table handler get path in lower case */ strmov(tmp_path, path); - my_casedn_str(system_charset_info, tmp_path); + my_casedn_str(files_charset_info, tmp_path); path= tmp_path; } int error=file->delete_table(path); @@ -1247,7 +1247,7 @@ int ha_create_table(const char *name, HA_CREATE_INFO *create_info, { /* Ensure that handler gets name in lower case */ strmov(name_buff, name); - my_casedn_str(system_charset_info, name_buff); + my_casedn_str(files_charset_info, name_buff); name= name_buff; } |