diff options
| author | unknown <reggie@mdk10.(none)> | 2005-04-11 09:29:49 -0500 |
|---|---|---|
| committer | unknown <reggie@mdk10.(none)> | 2005-04-11 09:29:49 -0500 |
| commit | c026b4f7f4523878e5dc2d2ce24261f22323d8e6 (patch) | |
| tree | 71d2ee8bc97f321c7a5d0bf9b826b26f696f436c /sql | |
| parent | d068b068c8d2253b29ec43060f5b5090cf5f67db (diff) | |
| parent | cd0ceaf8c8adfed93f4a3517f75478a27c35bd8e (diff) | |
| download | mariadb-git-c026b4f7f4523878e5dc2d2ce24261f22323d8e6.tar.gz | |
Merge mdk10.(none):/home/reggie/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-5.0
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/item_create.cc:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_create.cc | 1 | ||||
| -rw-r--r-- | sql/mysqld.cc | 21 |
2 files changed, 13 insertions, 9 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc index 35cc46989f7..b9073a6c0b3 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -303,6 +303,7 @@ Item *create_func_current_user() char buff[HOSTNAME_LENGTH+USERNAME_LENGTH+2]; uint length; + thd->lex->safe_to_cache_query= 0; length= (uint) (strxmov(buff, thd->priv_user, "@", thd->priv_host, NullS) - buff); return new Item_static_string_func("current_user()", diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 2d8a0eca877..2c44a789c79 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -788,15 +788,6 @@ void kill_mysql(void) CloseHandle(hEvent); */ } -#ifdef HAVE_SMEM - /* - Send event to smem_event_connect_request for aborting - */ - if (!SetEvent(smem_event_connect_request)) - { - DBUG_PRINT("error",("Got error: %ld from SetEvent of smem_event_connect_request",GetLastError())); - } -#endif #endif #elif defined(OS2) pthread_cond_signal(&eventShutdown); // post semaphore @@ -850,6 +841,18 @@ static void __cdecl kill_server(int sig_ptr) else sql_print_error(ER(ER_GOT_SIGNAL),my_progname,sig); /* purecov: inspected */ +#if defined(HAVE_SMEM) && defined(__WIN__) + /* + Send event to smem_event_connect_request for aborting + */ + if (!SetEvent(smem_event_connect_request)) + { + DBUG_PRINT("error", + ("Got error: %ld from SetEvent of smem_event_connect_request", + GetLastError())); + } +#endif + #if defined(__NETWARE__) || (defined(USE_ONE_SIGNAL_HAND) && !defined(__WIN__) && !defined(OS2)) my_thread_init(); // If this is a new thread #endif |