summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorunknown <jani@hynda.(none)>2003-05-13 22:28:34 +0300
committerunknown <jani@hynda.(none)>2003-05-13 22:28:34 +0300
commit32450d159b685660add0d2f68bc9d3a24b6bfb52 (patch)
tree9be52c420bc3c234537cf8f17d78e724715f2aff /sql/mysqld.cc
parent496357a18069730b97b303d40d91a9ac3ec3783f (diff)
downloadmariadb-git-32450d159b685660add0d2f68bc9d3a24b6bfb52.tar.gz
Fixed a bug in DROP DATABASE when database had a RAID type table.
Bug ID 381.
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 731298266dc..0211c471ed7 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -4722,11 +4722,9 @@ static void get_options(int argc,char **argv)
my_disable_locking= myisam_single_user= test(opt_external_locking == 0);
my_default_record_cache_size=global_system_variables.read_buff_size;
myisam_max_temp_length=
- (my_off_t) min(global_system_variables.myisam_max_sort_file_size,
- (ulonglong) MAX_FILE_SIZE);
+ (my_off_t) global_system_variables.myisam_max_sort_file_size;
myisam_max_extra_temp_length=
- (my_off_t) min(global_system_variables.myisam_max_extra_sort_file_size,
- (ulonglong) MAX_FILE_SIZE);
+ (my_off_t) global_system_variables.myisam_max_extra_sort_file_size;
/* Set global variables based on startup options */
myisam_block_size=(uint) 1 << my_bit_log2(opt_myisam_block_size);