information about different variables agged to query cache (BUG#5515, BUG#5394)

mysql-test/r/query_cache.result:
  test of QC with different variables
mysql-test/t/query_cache.test:
  test of QC with different variables
sql/mysql_priv.h:
  new information for query key calculation
sql/sql_cache.cc:
  new information for query key calculation
sql/sql_cache.h:
  removed unused definitions

1 files changed, 34 insertions, 0 deletions

diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test
index b3111b614c6..66e9f31823a 100644
--- a/mysql-test/t/query_cache.test
+++ b/mysql-test/t/query_cache.test
@@ -627,4 +627,38 @@ set character_set_results=null;
 select @@character_set_results;
 set character_set_results=default;
 
+#
+# query cache and environment variables
+#
+# max_sort_length
+set GLOBAL query_cache_size=1355776;
+create table t1 (id int auto_increment primary key, c char(25));
+insert into t1 set c = repeat('x',24);
+insert into t1 set c = concat(repeat('x',24),'x');
+insert into t1 set c = concat(repeat('x',24),'w');
+insert into t1 set c = concat(repeat('x',24),'y');
+set max_sort_length=200;   
+select c from t1 order by c, id;
+reset query cache;
+set max_sort_length=20;
+select c from t1 order by c, id;
+set max_sort_length=200;   
+select c from t1 order by c, id;
+set max_sort_length=default;
+# sql_mode
+select '1' || '3' from t1;
+set SQL_MODE=oracle;
+select '1' || '3' from t1;
+set SQL_MODE=default;
+drop table t1;
+# group_concat_max_len
+create table t1 (a varchar(20), b int);
+insert into t1 values ('12345678901234567890', 1);
+set group_concat_max_len=10;
+select group_concat(a) FROM t1 group by b;
+set group_concat_max_len=1024;
+select group_concat(a) FROM t1 group by b;
+set group_concat_max_len=default;
+drop table t1;
+
 SET GLOBAL query_cache_size=0;