diff options
| author | unknown <bell@51.0.168.192.in-addr.arpa> | 2005-02-22 14:52:26 +0200 |
|---|---|---|
| committer | unknown <bell@51.0.168.192.in-addr.arpa> | 2005-02-22 14:52:26 +0200 |
| commit | eff7e6afd18e0cffc27e967c9cd7d407d5a86a11 (patch) | |
| tree | dbd957df2123ecb08bc459489cd535d3b59758ae /sql/sql_db.cc | |
| parent | 2fadae91e2b2a80b6830f0775ccc536fb735620d (diff) | |
| parent | 6965e72bd07874efee8ff6f94ab664533fc422e0 (diff) | |
| download | mariadb-git-eff7e6afd18e0cffc27e967c9cd7d407d5a86a11.tar.gz | |
Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
BitKeeper/etc/logging_ok:
auto-union
sql/item.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 6b0f05406d8..c0b74d24d83 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -576,7 +576,8 @@ exit2: mysql_rm_db() thd Thread handle db Database name in the case given by user - It's already validated when we come here + It's already validated and set to lower case + (if needed) when we come here if_exists Don't give error if database doesn't exists silent Don't generate errors @@ -589,7 +590,7 @@ bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent) { long deleted=0; int error= 0; - char path[FN_REFLEN+16], tmp_db[NAME_LEN+1]; + char path[FN_REFLEN+16]; MY_DIR *dirp; uint length; DBUG_ENTER("mysql_rm_db"); @@ -636,13 +637,6 @@ bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent) error = 0; } } - if (lower_case_table_names) - { - /* Convert database to lower case */ - strmov(tmp_db, db); - my_casedn_str(files_charset_info, tmp_db); - db= tmp_db; - } if (!silent && deleted>=0) { const char *query; |