diff options
| author | unknown <monty@mysql.com> | 2004-12-06 17:16:35 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-12-06 17:16:35 +0200 |
| commit | 19a95482195a158425c66ac629d07da53e4fc1b6 (patch) | |
| tree | 5cfc0009e76810724a4db2904e75e2db2506bd46 /sql/mysqld.cc | |
| parent | a4a69f73126d247a519a50f5ba21357ce13839fe (diff) | |
| parent | a1fba2daccee3c7c5d46cded39fda7ee7f0d6eae (diff) | |
| download | mariadb-git-19a95482195a158425c66ac629d07da53e4fc1b6.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 27248ebaec2..42ae6982eb0 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2128,7 +2128,7 @@ extern "C" void *signal_hand(void *arg __attribute__((unused))) { reload_acl_and_cache((THD*) 0, (REFRESH_LOG | REFRESH_TABLES | REFRESH_FAST | - REFRESH_STATUS | REFRESH_GRANT | + REFRESH_GRANT | REFRESH_THREADS | REFRESH_HOSTS), (TABLE_LIST*) 0, NULL); // Flush logs mysql_print_status((THD*) 0); // Send debug some info @@ -4910,7 +4910,7 @@ log and this option does nothing anymore.", "Data file autoextend increment in megabytes", (gptr*) &srv_auto_extend_increment, (gptr*) &srv_auto_extend_increment, - 0, GET_LONG, REQUIRED_ARG, 8L, 1L, ~0L, 0, 1L, 0}, + 0, GET_LONG, REQUIRED_ARG, 8L, 1L, 1000L, 0, 1L, 0}, {"innodb_buffer_pool_awe_mem_mb", OPT_INNODB_BUFFER_POOL_AWE_MEM_MB, "If Windows AWE is used, the size of InnoDB buffer pool allocated from the AWE memory.", (gptr*) &innobase_buffer_pool_awe_mem_mb, (gptr*) &innobase_buffer_pool_awe_mem_mb, 0, |