diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-12-24 14:02:42 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-12-24 14:02:42 +0200 |
| commit | f46decc78025403ee118f1d30f6bed45bb854afb (patch) | |
| tree | 09a4fad0fb0076a17d9ede22eebdfba0f4323b00 /sql/sql_parse.cc | |
| parent | 7a74837e00be97bfaaf2940f06c636da7eed73a8 (diff) | |
| parent | b861d68321b6242bc2579a4458aa137efd2e42c2 (diff) | |
| download | mariadb-git-f46decc78025403ee118f1d30f6bed45bb854afb.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 553b9a1fe43..95a739014e5 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -23,6 +23,8 @@ #include <my_dir.h> #include <assert.h> +#define files_charset_info system_charset_info + #ifdef HAVE_INNOBASE_DB #include "ha_innodb.h" #endif @@ -1222,7 +1224,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, break; } if (lower_case_table_names) - my_casedn_str(system_charset_info, db); + my_casedn_str(files_charset_info, db); if (check_access(thd,CREATE_ACL,db,0,1)) break; mysql_log.write(thd,command,packet); @@ -1240,7 +1242,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, break; } if (lower_case_table_names) - my_casedn_str(system_charset_info, db); + my_casedn_str(files_charset_info, db); if (thd->locked_tables || thd->active_transaction()) { send_error(thd,ER_LOCK_OR_ACTIVE_TRANSACTION); @@ -2488,7 +2490,7 @@ mysql_execute_command(THD *thd) break; } if (lower_case_table_names) - my_casedn_str(system_charset_info, lex->name); + my_casedn_str(files_charset_info, lex->name); if (check_access(thd,CREATE_ACL,lex->name,0,1)) break; res=mysql_create_db(thd,lex->name,&lex->create_info,0); @@ -2502,7 +2504,7 @@ mysql_execute_command(THD *thd) break; } if (lower_case_table_names) - my_casedn_str(system_charset_info, lex->name); + my_casedn_str(files_charset_info, lex->name); if (check_access(thd,DROP_ACL,lex->name,0,1)) break; if (thd->locked_tables || thd->active_transaction()) @@ -2590,7 +2592,7 @@ mysql_execute_command(THD *thd) if (user->password.str && (strcmp(thd->user,user->user.str) || user->host.str && - my_strcasecmp(system_charset_info, + my_strcasecmp(my_charset_latin1, user->host.str, thd->host_or_ip))) { if (check_access(thd, UPDATE_ACL, "mysql",0,1)) @@ -3582,8 +3584,8 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd, ptr->alias= alias_str; if (lower_case_table_names) { - my_casedn_str(system_charset_info,ptr->db); - my_casedn_str(system_charset_info,table->table.str); + my_casedn_str(files_charset_info,ptr->db); + my_casedn_str(files_charset_info,table->table.str); } ptr->real_name=table->table.str; ptr->real_name_length=table->table.length; |