summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-12-06 02:36:19 +0200
committerunknown <monty@hundin.mysql.fi>2001-12-06 02:36:19 +0200
commit989f131d5f1af49b6618d7195868f118b09b242e (patch)
tree68e73082b59a24a1c78bca5bfbc5ae2d522517e1 /sql
parentb5cfb7ac01dd00715060470805859a51d6f2caf5 (diff)
parenta2e0a48cfa4b055fd72cfb9e0153c567feeb1031 (diff)
downloadmariadb-git-989f131d5f1af49b6618d7195868f118b09b242e.tar.gz
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi: Auto merged myisam/mi_write.c: Auto merged sql/mysqld.cc: Auto merged
Diffstat (limited to 'sql')
-rw-r--r--sql/mysqld.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index bc3fb3f7cb7..5acec4ead67 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2934,7 +2934,7 @@ CHANGEABLE_VAR changeable_vars[] = {
{ "max_write_lock_count", (long*) &max_write_lock_count,
~0L, 1, ~0L, 0, 1 },
{ "myisam_bulk_insert_tree_size", (long*) &myisam_bulk_insert_tree_size,
- 8192*1024, 4, ~0L, 0, 1 },
+ 8192*1024, 0, ~0L, 0, 1 },
{ "myisam_block_size", (long*) &opt_myisam_block_size,
MI_KEY_BLOCK_LENGTH, MI_MIN_KEY_BLOCK_LENGTH, MI_MAX_KEY_BLOCK_LENGTH,
0, MI_MIN_KEY_BLOCK_LENGTH },