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

fixed bug 209 (SQL_SELECT_LIMIT and query cache incompatibility)

Browse Source 
mysql-test/r/query_cache.result:
  test of SET OPTION SQL_SELECT_LIMIT
mysql-test/t/query_cache.test:
  test of SET OPTION SQL_SELECT_LIMIT
sql/sql_cache.cc:
  layout fixed
  SQL_SELECT_LIMIT stored in query cache now
sql/sql_parse.cc:
  room for SQL_SELECT_LAYOUT storing added
This commit is contained in:
unknown
2003-03-31 09:49:09 +03:00
parent 280a1e4ad3
commit a424d01173
4 changed files with 49 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -581,3 +581,21 @@ show status like "Qcache_queries_in_cache";
Variable_name Value
Qcache_queries_in_cache 0
drop table t1;
create table t1 (a int);
insert into t1 values (1),(2);
show status like "Qcache_queries_in_cache";
Variable_name Value
Qcache_queries_in_cache 0
select * from t1;
a
1
2
SET OPTION SQL_SELECT_LIMIT=1;
select * from t1;
a
1
show status like "Qcache_queries_in_cache";
Variable_name Value
Qcache_queries_in_cache 2
SET OPTION SQL_SELECT_LIMIT=DEFAULT;
drop table t1;

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

@ -401,7 +401,6 @@ select * from t1 where id=2;
#
# Load data invalidation test
#
create table t1 (word char(20) not null);
select * from t1;
show status like "Qcache_queries_in_cache";
@ -412,7 +411,6 @@ drop table t1;
#
# INTO OUTFILE/DUMPFILE test
#
drop table if exists t1;
create table t1 (a int);
insert into t1 values (1),(2),(3);
@ -421,3 +419,16 @@ select * from t1 into outfile "query_caceh.out.file";
select * from t1 limit 1 into dumpfile "query_cache.dump.file";
show status like "Qcache_queries_in_cache";
drop table t1;
#
# test of SQL_SELECT_LIMIT
#
create table t1 (a int);
insert into t1 values (1),(2);
show status like "Qcache_queries_in_cache";
select * from t1;
SET OPTION SQL_SELECT_LIMIT=1;
select * from t1;
show status like "Qcache_queries_in_cache";
SET OPTION SQL_SELECT_LIMIT=DEFAULT;
drop table t1;

9
sql/sql_cache.cc
View File

@ -775,8 +775,10 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used)
flags|= (byte) thd->variables.convert_set->number();
DBUG_ASSERT(thd->variables.convert_set->number() < 128);
}
tot_length=thd->query_length+thd->db_length+2;
tot_length= thd->query_length+thd->db_length+2+sizeof(ha_rows);
thd->query[tot_length-1]= (char) flags;
memcpy((void *)(thd->query + (tot_length-sizeof(ha_rows)-1)),
(const void *)&thd->variables.select_limit, sizeof(ha_rows));
/* Check if another thread is processing the same query? */
Query_cache_block *competitor = (Query_cache_block *)
@ -910,7 +912,7 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length)
}
Query_cache_block *query_block;
tot_length=query_length+thd->db_length+2;
tot_length= query_length+thd->db_length+2+sizeof(ha_rows);
if (thd->db_length)
{
memcpy(sql+query_length+1, thd->db, thd->db_length);
@ -933,8 +935,11 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length)
DBUG_ASSERT(thd->variables.convert_set->number() < 128);
}
sql[tot_length-1]= (char) flags;
memcpy((void *)(sql + (tot_length-sizeof(ha_rows)-1)),
(const void *)&thd->variables.select_limit, sizeof(ha_rows));
query_block= (Query_cache_block *) hash_search(&queries, (byte*) sql,
tot_length);
/* Quick abort on unlocked data */
if (query_block == 0 ||
query_block->query()->result() == 0 ||

3
sql/sql_parse.cc
View File

@ -1029,7 +1029,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
/* We must allocate some extra memory for query cache */
if (!(thd->query= (char*) thd->memdup_w_gap((gptr) (packet),
packet_length,
thd->db_length+2)))
thd->db_length+2+
sizeof(ha_rows))))
break;
thd->query[packet_length]=0;
thd->packet.shrink(thd->variables.net_buffer_length);// Reclaim some memory