summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorheikki@hundin.mysql.fi <>2002-02-14 00:00:09 +0200
committerheikki@hundin.mysql.fi <>2002-02-14 00:00:09 +0200
commit62c9f03f002c6e7d8bbfcfcf6e0275c592a7f3fb (patch)
tree7903c2892cbc591c0f8746ed4a723c1a4d0c1041 /sql
parent3c18798a7fee6b00d5f16bd56cc74a42aa754fde (diff)
downloadmariadb-git-62c9f03f002c6e7d8bbfcfcf6e0275c592a7f3fb.tar.gz
ha_innobase.cc:
DROP DATABASE required that the database name is in lower case to work; put it always to lower case in innobase_drop_database
Diffstat (limited to 'sql')
-rw-r--r--sql/ha_innobase.cc13
1 files changed, 11 insertions, 2 deletions
diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc
index 9a4dc070978..fe91a6f630c 100644
--- a/sql/ha_innobase.cc
+++ b/sql/ha_innobase.cc
@@ -85,7 +85,7 @@ long innobase_mirrored_log_groups, innobase_log_files_in_group,
char *innobase_data_home_dir, *innobase_data_file_path;
char *innobase_log_group_home_dir, *innobase_log_arch_dir;
char *innobase_unix_file_flush_method;
-my_bool innobase_flush_log_at_trx_commit, innobase_log_archive,
+bool innobase_flush_log_at_trx_commit, innobase_log_archive,
innobase_use_native_aio, innobase_fast_shutdown;
/* innobase_data_file_path=ibdata:15,idata2:1,... */
@@ -2804,6 +2804,16 @@ innobase_drop_database(
namebuf[len] = '/';
namebuf[len + 1] = '\0';
+#ifdef __WIN__
+ /* Put to lower case */
+
+ ptr = namebuf;
+
+ while (*ptr != '\0') {
+ *ptr = tolower(*ptr);
+ ptr++;
+ }
+#endif
trx = trx_allocate_for_mysql();
error = row_drop_database_for_mysql(namebuf, trx);
@@ -2954,7 +2964,6 @@ ha_innobase::records_in_range(
my_free((char*) key_val_buff2, MYF(0));
-
DBUG_RETURN((ha_rows) n_rows);
}