diff options
| author | monty@hundin.mysql.fi <> | 2002-02-14 02:39:38 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-02-14 02:39:38 +0200 |
| commit | 0ccb106afcb3b1966e71709605602549d355fb80 (patch) | |
| tree | f747199e7b5d39f30b105759d6517db9d3555274 | |
| parent | d0fc67f4ac2e85ce411cf27cc56b9d215095fc17 (diff) | |
| parent | 62c9f03f002c6e7d8bbfcfcf6e0275c592a7f3fb (diff) | |
| download | mariadb-git-0ccb106afcb3b1966e71709605602549d355fb80.tar.gz | |
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | sql/ha_innobase.cc | 13 |
2 files changed, 12 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index a520b05f376..03e5543a92f 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -11,3 +11,4 @@ mwagner@cash.mwagner.org paul@central.snake.net sasha@mysql.sashanet.com serg@serg.mysql.com +heikki@hundin.mysql.fi 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); } |