diff options
| author | unknown <monty@mysql.com> | 2005-04-06 17:23:34 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-04-06 17:23:34 +0300 |
| commit | d958b6361b0423a1730d863f8d8365430b12b0b2 (patch) | |
| tree | 93f6d3110304b3fd99d36a01029f1d96c57e2cb8 /sql/mysqld.cc | |
| parent | bf67f4c7dad98a7e19d75ca3f3632098648408e3 (diff) | |
| parent | 080c8ab39bb110370b64837613e8453702b353c1 (diff) | |
| download | mariadb-git-d958b6361b0423a1730d863f8d8365430b12b0b2.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
mysql-test/mysql-test-run.sh:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index c213fcbf050..2d8a0eca877 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1510,6 +1510,7 @@ void end_thread(THD *thd, bool put_in_cache) thd=thread_cache.get(); thd->real_id=pthread_self(); (void) thd->store_globals(); + thd->thr_create_time= time(NULL); threads.append(thd); pthread_mutex_unlock(&LOCK_thread_count); DBUG_VOID_RETURN; @@ -5170,7 +5171,7 @@ log and this option does nothing anymore.", (gptr*) &dflt_key_cache_var.param_buff_size, (gptr*) 0, 0, (GET_ULL | GET_ASK_ADDR), - REQUIRED_ARG, KEY_CACHE_SIZE, MALLOC_OVERHEAD, UINT_MAX32, MALLOC_OVERHEAD, + REQUIRED_ARG, KEY_CACHE_SIZE, MALLOC_OVERHEAD, ~(ulong) 0, MALLOC_OVERHEAD, IO_SIZE, 0}, {"key_cache_age_threshold", OPT_KEY_CACHE_AGE_THRESHOLD, "This characterizes the number of hits a hot block has to be untouched until it is considered aged enough to be downgraded to a warm block. This specifies the percentage ratio of that number of hits to the total number of blocks in key cache", |