diff options
| author | unknown <nick@mysql.com> | 2002-10-17 14:57:01 -0600 |
|---|---|---|
| committer | unknown <nick@mysql.com> | 2002-10-17 14:57:01 -0600 |
| commit | d2e52820f6b8f4d345af2a5e5c6a5fa792171757 (patch) | |
| tree | 5ebc018564e0bd60dcd13b52589e89409cb617f5 | |
| parent | 516256c8cfda8a1b71b02c6aca576c90ecdf74d5 (diff) | |
| download | mariadb-git-d2e52820f6b8f4d345af2a5e5c6a5fa792171757.tar.gz | |
Moved rand initialization from mysqld.cc to sql_class.cc:THD::THD()
| -rw-r--r-- | sql/mysqld.cc | 12 | ||||
| -rw-r--r-- | sql/sql_class.cc | 14 |
2 files changed, 16 insertions, 10 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index f3aef7f1622..ae80ab9ea6b 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -288,7 +288,7 @@ int segfaulted = 0; // ensure we do not enter SIGSEGV handler twice */ static bool kill_in_progress=FALSE; -static struct rand_struct sql_rand; +struct rand_struct sql_rand; // used by sql_class.cc:THD::THD() static int cleanup_done; static char **defaults_argv; char glob_hostname[FN_REFLEN]; @@ -2423,15 +2423,7 @@ static void create_new_thread(THD *thd) for (uint i=0; i < 8 ; i++) // Generate password teststring thd->scramble[i]= (char) (rnd(&sql_rand)*94+33); thd->scramble[8]=0; - /* - We need good random number initialization for new thread - Just coping global one will not work - */ - { - ulong tmp=(ulong) (rnd(&sql_rand) * 3000000); - randominit(&(thd->rand), tmp + (ulong) start_time, - tmp + (ulong) thread_id); - } + thd->real_id=pthread_self(); // Keep purify happy /* Start a new thread to handle connection */ diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 896bdec2913..fc64dfa13f9 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -37,6 +37,8 @@ #include <mysys_err.h> #include <assert.h> +extern struct rand_struct sql_rand; + /***************************************************************************** ** Instansiate templates *****************************************************************************/ @@ -158,6 +160,18 @@ THD::THD():user_time(0),fatal_error(0),last_insert_id_used(0), transaction.trans_log.end_of_file= max_binlog_cache_size; } #endif + + /* + We need good random number initialization for new thread + Just coping global one will not work + */ + { + pthread_mutex_lock(&LOCK_thread_count); + ulong tmp=(ulong) (rnd(&sql_rand) * 3000000); + randominit(&rand, tmp + (ulong) start_time, + tmp + (ulong) thread_id); + pthread_mutex_unlock(&LOCK_thread_count); + } } /* Do operations that may take a long time */ |