diff options
| author | unknown <monty@mysql.com> | 2005-08-11 16:43:22 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-08-11 16:43:22 +0300 |
| commit | a665a807a8bde1f33f4ea982f91094f9e7ca4db3 (patch) | |
| tree | 34d11d26935b8393579432cab64f17d9842ac38c /sql/mysqld.cc | |
| parent | 2dd771c4db5e06da50df3621351296eb6b5a4f63 (diff) | |
| parent | 8fd5120df08c61bcdc381d370e89cd7c2a6f7f12 (diff) | |
| download | mariadb-git-a665a807a8bde1f33f4ea982f91094f9e7ca4db3.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
mysql-test/t/sp.test:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sp_cache.cc:
manual merge
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index f8bfcb75be2..4989b0e623c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1908,7 +1908,8 @@ static void check_data_home(const char *path) static void sig_reload(int signo) { // Flush everything - reload_acl_and_cache((THD*) 0,REFRESH_LOG, (TABLE_LIST*) 0, NULL); + bool not_used; + reload_acl_and_cache((THD*) 0,REFRESH_LOG, (TABLE_LIST*) 0, ¬_used); signal(signo, SIG_ACK); } @@ -2267,12 +2268,13 @@ static void *signal_hand(void *arg __attribute__((unused))) case SIGHUP: if (!abort_loop) { + bool not_used; mysql_print_status(); // Print some debug info reload_acl_and_cache((THD*) 0, (REFRESH_LOG | REFRESH_TABLES | REFRESH_FAST | REFRESH_GRANT | REFRESH_THREADS | REFRESH_HOSTS), - (TABLE_LIST*) 0, NULL); // Flush logs + (TABLE_LIST*) 0, ¬_used); // Flush logs } break; #ifdef USE_ONE_SIGNAL_HAND |