database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/home/dlenev/src/mysql-4.0-bg9796

Browse Source 
into mysql.com:/home/dlenev/src/mysql-4.1-merges


sql/item_create.cc:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
This commit is contained in:
unknown
2005-04-11 09:53:54 +04:00
parent ebdf2c0153 3e0a626367
commit d79e696952
3 changed files with 4 additions and 0 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

@ -306,6 +306,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->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_string(NullS, thd->memdup(buff, length), length, return new Item_string(NullS, thd->memdup(buff, length), length,