diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-09-05 17:17:22 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-09-05 17:17:22 +0300 |
| commit | d99cab040c90913cc5186702166d3b91f58ef42a (patch) | |
| tree | d450d537ab0f508355515286214ee0df908984e5 /sql/sql_parse.cc | |
| parent | 60d9eb907244483e82b67cd920e03d4147bac349 (diff) | |
| parent | 8f2482d283646d61c6614df39d252e1fd3713f7c (diff) | |
| download | mariadb-git-d99cab040c90913cc5186702166d3b91f58ef42a.tar.gz | |
Merge
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Docs/manual.texi:
SCCS merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 9dab8df9bea..e291334a29d 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -621,9 +621,6 @@ pthread_handler_decl(handle_one_connection,arg) { int error; NET *net= &thd->net; - - thd->mysys_var=my_thread_var; - thd->dbug_thread_id=my_thread_id(); thd->thread_stack= (char*) &thd; if ((error=check_connections(thd))) @@ -706,8 +703,6 @@ pthread_handler_decl(handle_bootstrap,arg) pthread_detach_this_thread(); thd->thread_stack= (char*) &thd; - thd->mysys_var=my_thread_var; - thd->dbug_thread_id=my_thread_id(); #if !defined(__WIN__) && !defined(OS2) sigset_t set; VOID(sigemptyset(&set)); // Get mask in use @@ -3324,7 +3319,7 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables) select_errors=0; /* Write if more errors */ if (options & REFRESH_GRANT) { - acl_reload(); + acl_reload(thd); grant_reload(); if (mqh_used) reset_mqh(thd,(LEX_USER *) NULL,true); |