database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge

Browse Source 
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
Docs/manual.texi:
  SCCS merged
This commit is contained in:
unknown
2002-09-05 17:17:22 +03:00
parent 60d9eb9072 8f2482d283
commit d99cab040c
33 changed files with 356 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_parse.cc
View File

@@ -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);