database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge mdk10.(none):/home/reggie/bk/mysql-4.1

Browse Source 
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
This commit is contained in:
unknown
2005-04-11 09:29:49 -05:00
parent d068b068c8 cd0ceaf8c8
commit c026b4f7f4
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/query_cache.result
View File

@ -299,6 +299,8 @@ select UNIX_TIMESTAMP() from t1;
UNIX_TIMESTAMP() UNIX_TIMESTAMP()
select USER() from t1; select USER() from t1;
USER() USER()
select CURRENT_USER() from t1;
CURRENT_USER()
select benchmark(1,1) from t1; select benchmark(1,1) from t1;
benchmark(1,1) benchmark(1,1)
explain extended select benchmark(1,1) from t1; explain extended select benchmark(1,1) from t1;

1
mysql-test/t/query_cache.test
View File

@ -184,6 +184,7 @@ select LAST_INSERT_ID() from t1;
select RAND() from t1; select RAND() from t1;
select UNIX_TIMESTAMP() from t1; select UNIX_TIMESTAMP() from t1;
select USER() from t1; select USER() from t1;
select CURRENT_USER() from t1;
select benchmark(1,1) from t1; select benchmark(1,1) from t1;
explain extended select benchmark(1,1) from t1; explain extended select benchmark(1,1) from t1;
show status like "Qcache_queries_in_cache"; show status like "Qcache_queries_in_cache";

1
sql/item_create.cc
View File

@ -303,6 +303,7 @@ Item *create_func_current_user()
char buff[HOSTNAME_LENGTH+USERNAME_LENGTH+2]; char buff[HOSTNAME_LENGTH+USERNAME_LENGTH+2];
uint length; uint length;
thd->lex->safe_to_cache_query= 0;
length= (uint) (strxmov(buff, thd->priv_user, "@", thd->priv_host, NullS) - length= (uint) (strxmov(buff, thd->priv_user, "@", thd->priv_host, NullS) -
buff); buff);
return new Item_static_string_func("current_user()", return new Item_static_string_func("current_user()",

21
sql/mysqld.cc
View File

@ -788,15 +788,6 @@ void kill_mysql(void)
CloseHandle(hEvent); 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 #endif
#elif defined(OS2) #elif defined(OS2)
pthread_cond_signal(&eventShutdown); // post semaphore pthread_cond_signal(&eventShutdown); // post semaphore
@ -850,6 +841,18 @@ static void __cdecl kill_server(int sig_ptr)
else else
sql_print_error(ER(ER_GOT_SIGNAL),my_progname,sig); /* purecov: inspected */ 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)) #if defined(__NETWARE__) || (defined(USE_ONE_SIGNAL_HAND) && !defined(__WIN__) && !defined(OS2))
my_thread_init(); // If this is a new thread my_thread_init(); // If this is a new thread
#endif #endif