List:Commits« Previous MessageNext Message »
From:Guilhem Bichot Date:March 9 2007 5:10pm
Subject:bk commit into 5.1 tree (guilhem:1.2463) BUG#735
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of guilhem. When guilhem does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-09 18:09:57+01:00, guilhem@stripped +13 -0
  Fix for BUG#735 "Prepared Statements: there is no support for Query
  Cache".
  WL#1569 "Prepared Statements: implement support of Query Cache".
  Prepared SELECTs did not look up in the query cache, and their results
  were not stored in the query cache. This made them slower than
  non-prepared SELECTs in some cases.
  The fix is to re-use the expanded query (the prepared query where
  "?" placeholders are replaced by their values, at execution time)
  for searching/storing in the query cache.
  It works fine for statements prepared via mysql_stmt_prepare(), which
  are the most commonly used and were the scope of this bugfix and WL.
  It works less fine for statements prepared via the SQL command
  PREPARE...FROM, which are still not using the query cache if they
  have at least one parameter (because then the expanded query contains
  names of user variables, and user variables don't work with the
  query cache, even in non-prepared queries).
  Note that results from prepared SELECTs, which are in the binary
  protocol, and results from normal SELECTs, which are in the text
  protocol, ignore each other in the query cache, because a result in the
  binary protocol should never be served to a SELECT expecting the text
  protocol and vice-versa.
  Note, after this patch, bug 25843 starts applying to query cache
  ("changing default database between PREPARE and EXECUTE of statement
  breaks binlog"), we need to fix it.

  mysql-test/include/have_query_cache.inc@stripped, 2007-03-09 18:09:54+01:00, guilhem@stripped +0 -3
    Now prepared statements work with the query cache, so don't disable
    prep stmts by default when doing a query cache test. All tests which
    include this file will now be really tested against prepared
    statements (in particular, query_cache.test).

  mysql-test/r/query_cache.result@stripped, 2007-03-09 18:09:54+01:00, guilhem@stripped +23 -0
    result update

  mysql-test/r/query_cache_sql_prepare.result@stripped, 2007-03-09 18:09:54+01:00, guilhem@stripped +204 -0
    result of new test: we see hits when there is no parameter,
    no hit when there is a parameter.

  mysql-test/r/query_cache_sql_prepare.result@stripped, 2007-03-09 18:09:54+01:00, guilhem@stripped +0 -0

  mysql-test/t/grant_cache.test@stripped, 2007-03-09 18:09:54+01:00, guilhem@stripped +26 -0
    Cannot enable this test in ps-protocol, because in normal protocol,
    a SELECT failing due to insufficient privileges increments
    Qcache_not_cached, while in ps-protocol, no.
    In detail: in normal protocol,
    the "access denied" errors on SELECT are issued at (stack trace):
    mysql_parse/mysql_execute_command/execute_sqlcom_select/handle_select/
    mysql_select/JOIN::prepare/setup_wild/insert_fields/
    check_grant_all_columns/my_error/my_message_sql, which then calls
    push_warning/query_cache_abort: at this moment,
    query_cache_store_query() has been called, so query exists in cache,
    so thd->net.query_cache_query!=NULL, so query_cache_abort() removes
    the query from cache, which causes a query_cache.refused++ (thus,
    a Qcache_not_cached++).
    While in ps-protocol, the error is issued at prepare time;
    for this mysql_test_select() is called, not execute_sqlcom_select()
    (and that also leads to JOIN::prepare/etc). Thus, as
    query_cache_store_query() has not been called,
    thd->net.query_cache_query==NULL, so query_cache_abort() does nothing:
    Qcache_not_cached is not incremented.
    As this test prints Qcache_not_cached after SELECT failures,
    we cannot enable this test in ps-protocol.

  mysql-test/t/ndb_cache_multi2.test@stripped, 2007-03-09 18:09:54+01:00, guilhem@stripped +31 -0
    The principle of this test is: two mysqlds connected to one cluster,
    both using their query cache. Queries are cached in server1
    ("select a!=3 from t1", "select * from t1"),
    table t1 is modified in server2, we want to see that this invalidates
    the query cache of server1. Invalidation with NDB works like this:
    when a query is found in the query cache, NDB is asked if the tables
    have changed. In this test, ha_ndbcluster calls NDB every millisecond
    to collect change information about tables.
    Due to this millisecond delay, there is need for a loop ("while...")
    in this test, which waits until a query1 ("select a!=3 from t1") is
    invalidated (which is equivalent to it returning
    up-to-date results), and then expects query2 ("select * from t1")
    to have been invalidated (see up-to-date results).
    But when enabling --ps-protocol in this test, the logic breaks,
    because query1 is still done via mysql_real_query() (see mysqltest.c:
    eval_expr() always uses mysql_real_query()). So, query1 returning
    up-to-date results is not a sign of it being invalidated in the cache,
    because it was NOT in the cache ("select a!=3 from t1" on line 39
    was done with prep stmts, while `select a!=3 from t1` is not,
    thus the second does not see the first in the cache). Thus, we may run
    query2 when cache still has not been invalidated.
    The solution is to make the initial "select a!=3 from t1" run
    as a normal query, this repairs the broken logic.
    But note, "select * from t1" is still using prepared statements
    which was the goal of this test with --ps-protocol.

  mysql-test/t/query_cache.test@stripped, 2007-03-09 18:09:54+01:00, guilhem@stripped +20 -0
    now that prepared statements work with the query cache, we check
    that results in binary protocol (prepared statements) and in text
    protocol (normal queries) don't mix in the query cache even though
    the text of the statement/query are identical.

  mysql-test/t/query_cache_sql_prepare.test@stripped, 2007-03-09 18:09:54+01:00, guilhem@stripped +144 -0
    new test to see if SQL PREPARE'd statements enter/hit the query cache:
    - if having at least one parameter, they should not
    - if having zero parameters, they should.

  mysql-test/t/query_cache_sql_prepare.test@stripped, 2007-03-09 18:09:54+01:00, guilhem@stripped +0 -0

  sql/mysql_priv.h@stripped, 2007-03-09 18:09:54+01:00, guilhem@stripped +8 -0
    In class Query_cache_flags, we add a bit to say if the result
    is in binary or text format (because, a result in binary format
    should never be served to a query expecting text format, and vice-
    versa).
    A macro to emphasize that we read the size of the query cache
    without mutex ("maybe" word).
    A macro which gives a first indication of if a query is cache-able
    (first indication - it does not consider the query cache's state).

  sql/protocol.cc@stripped, 2007-03-09 18:09:54+01:00, guilhem@stripped +4 -3
    indentation.

  sql/protocol.h@stripped, 2007-03-09 18:09:54+01:00, guilhem@stripped +11 -0
    Children classes of Protocol report their type (currently,
    text or binary). Query cache needs to know that.

  sql/sql_cache.cc@stripped, 2007-03-09 18:09:54+01:00, guilhem@stripped +15 -5
    When we store a result in the query cache, we need to remember if it's
    in binary or text format. And when we search for a result in the query
    cache, we need to select only those results which are in the format
    which the current statement expects (binary or text).

  sql/sql_prepare.cc@stripped, 2007-03-09 18:09:54+01:00, guilhem@stripped +54 -16
    Enabling use of the query cache by prepared statements.
    1) Prep stmts are of two types:
      a) prepared via the mysql_stmt_prepare() API call
      b) prepared via the SQL PREPARE...FROM statement.
    2) We already, when executing a prepared statement, sometimes built an
    "expanded" statement. For a), "?" placeholders were replaced by their
    values. For b), by names of the user variables containing the values.
    We did that only when we needed to write the query to logs.
    We now use this expanded query also for storing/searching
    in the query cache.
    Assume a query "SELECT * FROM T WHERE c=?", and the parameter is 10.
    For a), the expanded query is "SELECT * FROM T WHERE c=10", we look
    for "SELECT * FROM T WHERE c=10" in the query cache, and store that
    query's result in the query cache.
    For b), the expanded query is "SELECT * FROM T WHERE c=@somevar", and
    user variables don't work with the query cache (even inside non-
    prepared queries), so we don't enable query caching for SQL PREPARE'd
    statements if they have at least one parameter (see
    "if (stmt->param_count > 0)" in the patch).
    3) If query cache is enabled and this is a SELECT, we build the
    expanded query (as an optimisation, we don't want to build this
    expanded query if the query cache is disabled or this is not a SELECT).
    As the decision of building the expanded query or not is taken
    at prepare time (setup_set_params()), if query cache is disabled
    at prepare time, we won't build the expanded query at all next
    executions, thus shouldn't use this query for query cacheing.
    To ensure that we don't, we set safe_to_cache_query to FALSE.
    Note that we read the size of the query cache without mutex, which is
    ok: if we see it 0 but that cache has just been enlarged, no big deal,
    just our statement will not use the query cache; if we see it >0 but
    that cache has just been made destroyed, we'll build the expanded
    query at all executions, but query_cache_store_query() and
    query_cache_send_result_to_client() will read the size with a mutex
    and so properly decide to cache or not cache.
    4) Some functions in this file were named "withlog", others "with_log",
    now using "with_log" for all.

  tests/mysql_client_test.c@stripped, 2007-03-09 18:09:54+01:00, guilhem@stripped +268 -2
    Testing of how prepared statements enter and hit the query cache.
    test_ps_query_cache() is inspired from test_ps_conj_select().
    It creates data, a prepared SELECT statement, executes it once,
    then a second time with the same parameter value, to see that cache
    is hit, then a 3rd time with another parameter value to see that cache
    is not hit. Then, same from another connection, expecting hits.
    Then, tests border cases (enables query cache at prepare and disables
    at execute and vice-versa).
    It checks all results of SELECTs, cache hits and misses.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	guilhem
# Host:	gbichot3.local
# Root:	/home/mysql_src/mysql-5.1-runtime-735-realfix

--- 1.479/sql/mysql_priv.h	2007-03-09 18:10:05 +01:00
+++ 1.480/sql/mysql_priv.h	2007-03-09 18:10:05 +01:00
@@ -647,6 +647,7 @@ struct Query_cache_query_flags
 {
   unsigned int client_long_flag:1;
   unsigned int client_protocol_41:1;
+  unsigned int result_in_binary_protocol:1;
   unsigned int more_results_exists:1;
   unsigned int pkt_nr;
   uint character_set_client_num;
@@ -673,6 +674,11 @@ struct Query_cache_query_flags
   query_cache.send_result_to_client(A, B, C)
 #define query_cache_invalidate_by_MyISAM_filename_ref \
   &query_cache_invalidate_by_MyISAM_filename
+/* note the "maybe": it's a read without mutex */
+#define query_cache_maybe_disabled(T)                                 \
+  (T->variables.query_cache_type == 0 || query_cache.query_cache_size == 0)
+#define query_cache_is_cacheable_query(L) \
+  (((L)->sql_command == SQLCOM_SELECT) && (L)->safe_to_cache_query)
 #else
 #define QUERY_CACHE_FLAGS_SIZE 0
 #define query_cache_store_query(A, B)
@@ -689,6 +695,8 @@ struct Query_cache_query_flags
 #define query_cache_abort(A)
 #define query_cache_end_of_result(A)
 #define query_cache_invalidate_by_MyISAM_filename_ref NULL
+#define query_cache_maybe_disabled(T) 1
+#define query_cache_is_cacheable_query(L) 0
 #endif /*HAVE_QUERY_CACHE*/
 
 /*

--- 1.125/sql/protocol.cc	2007-03-09 18:10:05 +01:00
+++ 1.126/sql/protocol.cc	2007-03-09 18:10:05 +01:00
@@ -818,7 +818,7 @@ bool Protocol_text::store(const char *fr
 
 
 bool Protocol_text::store(const char *from, uint length,
-			    CHARSET_INFO *fromcs)
+                          CHARSET_INFO *fromcs)
 {
   CHARSET_INFO *tocs= this->thd->variables.character_set_results;
 #ifndef DBUG_OFF
@@ -1062,7 +1062,8 @@ void Protocol_binary::prepare_for_resend
 }
 
 
-bool Protocol_binary::store(const char *from, uint length, CHARSET_INFO *fromcs)
+bool Protocol_binary::store(const char *from, uint length,
+                            CHARSET_INFO *fromcs)
 {
   CHARSET_INFO *tocs= thd->variables.character_set_results;
   field_pos++;
@@ -1070,7 +1071,7 @@ bool Protocol_binary::store(const char *
 }
 
 bool Protocol_binary::store(const char *from,uint length,
-			  CHARSET_INFO *fromcs, CHARSET_INFO *tocs)
+                            CHARSET_INFO *fromcs, CHARSET_INFO *tocs)
 {
   field_pos++;
   return store_string_aux(from, length, fromcs, tocs);

--- 1.105/sql/sql_cache.cc	2007-03-09 18:10:05 +01:00
+++ 1.106/sql/sql_cache.cc	2007-03-09 18:10:05 +01:00
@@ -844,6 +844,12 @@ void Query_cache::store_query(THD *thd, 
     flags.client_long_flag= test(thd->client_capabilities & CLIENT_LONG_FLAG);
     flags.client_protocol_41= test(thd->client_capabilities &
                                    CLIENT_PROTOCOL_41);
+    /*
+      Protocol influences result format, so statement results in the binary
+      protocol (COM_EXECUTE) cannot be served to statements asking for results
+      in the text protocol (COM_QUERY) and vice-versa.
+    */
+    flags.result_in_binary_protocol= (unsigned int) thd->protocol->type();
     flags.more_results_exists= test(thd->server_status &
                                     SERVER_MORE_RESULTS_EXISTS);
     flags.pkt_nr= net->pkt_nr;
@@ -861,11 +867,13 @@ void Query_cache::store_query(THD *thd, 
     flags.max_sort_length= thd->variables.max_sort_length;
     flags.lc_time_names= thd->variables.lc_time_names;
     flags.group_concat_max_len= thd->variables.group_concat_max_len;
-    DBUG_PRINT("qcache", ("long %d, 4.1: %d, more results %d, pkt_nr: %d, \
+    DBUG_PRINT("qcache", ("\
+long %d, 4.1: %d, bin_proto: %d, more results %d, pkt_nr: %d, \
 CS client: %u, CS result: %u, CS conn: %u, limit: %lu, TZ: 0x%lx, \
 sql mode: 0x%lx, sort len: %lu, conncat len: %lu",
                           (int)flags.client_long_flag,
                           (int)flags.client_protocol_41,
+                          (int)flags.result_in_binary_protocol,
                           (int)flags.more_results_exists,
                           flags.pkt_nr,
                           flags.character_set_client_num,
@@ -1089,6 +1097,7 @@ Query_cache::send_result_to_client(THD *
   flags.client_long_flag= test(thd->client_capabilities & CLIENT_LONG_FLAG);
   flags.client_protocol_41= test(thd->client_capabilities &
                                  CLIENT_PROTOCOL_41);
+  flags.result_in_binary_protocol= (unsigned int)thd->protocol->type();
   flags.more_results_exists= test(thd->server_status &
                                   SERVER_MORE_RESULTS_EXISTS);
   flags.pkt_nr= thd->net.pkt_nr;
@@ -1104,11 +1113,13 @@ Query_cache::send_result_to_client(THD *
   flags.max_sort_length= thd->variables.max_sort_length;
   flags.group_concat_max_len= thd->variables.group_concat_max_len;
   flags.lc_time_names= thd->variables.lc_time_names;
-  DBUG_PRINT("qcache", ("long %d, 4.1: %d, more results %d, pkt_nr: %d, \
+  DBUG_PRINT("qcache", ("\
+long %d, 4.1: %d, bin_proto: %d, more results %d, pkt_nr: %d, \
 CS client: %u, CS result: %u, CS conn: %u, limit: %lu, TZ: 0x%lx, \
 sql mode: 0x%lx, sort len: %lu, conncat len: %lu",
                           (int)flags.client_long_flag,
                           (int)flags.client_protocol_41,
+                          (int)flags.result_in_binary_protocol,
                           (int)flags.more_results_exists,
                           flags.pkt_nr,
                           flags.character_set_client_num,
@@ -3048,11 +3059,10 @@ Query_cache::is_cacheable(THD *thd, uint
   TABLE_COUNTER_TYPE table_count;
   DBUG_ENTER("Query_cache::is_cacheable");
 
-  if (lex->sql_command == SQLCOM_SELECT &&
+  if (query_cache_is_cacheable_query(lex) &&
       (thd->variables.query_cache_type == 1 ||
        (thd->variables.query_cache_type == 2 && (lex->select_lex.options &
-						 OPTION_TO_QUERY_CACHE))) &&
-      lex->safe_to_cache_query)
+						 OPTION_TO_QUERY_CACHE))))
   {
     DBUG_PRINT("qcache", ("options: %lx  %lx  type: %u",
                           (long) OPTION_TO_QUERY_CACHE,

--- 1.4/mysql-test/include/have_query_cache.inc	2007-03-09 18:10:05 +01:00
+++ 1.5/mysql-test/include/have_query_cache.inc	2007-03-09 18:10:05 +01:00
@@ -1,7 +1,4 @@
 -- require r/have_query_cache.require
-# As PS are not cached we disable them to ensure the we get the right number
-# of query cache hits
--- disable_ps_protocol
 disable_query_log;
 show variables like "have_query_cache";
 enable_query_log;
--- New file ---
+++ mysql-test/r/query_cache_sql_prepare.result	07/03/09 18:09:54
set global query_cache_size=100000;
flush status;
create table t1(c1 int);
insert into t1 values(1),(10),(100);
prepare stmt1 from "select * from t1 where c1=10";
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	0
execute stmt1;
c1
10
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	0
execute stmt1;
c1
10
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	1
execute stmt1;
c1
10
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	2
prepare stmt2 from "select * from t1 where c1=10";
execute stmt2;
c1
10
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	3
execute stmt2;
c1
10
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	4
execute stmt2;
c1
10
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	5
prepare stmt3 from "select * from t1 where c1=10";
execute stmt3;
c1
10
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	6
execute stmt3;
c1
10
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	7
execute stmt3;
c1
10
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	8
select * from t1 where c1=10;
c1
10
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	9
flush tables;
execute stmt1;
c1
10
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	9
select * from t1 where c1=10;
c1
10
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	10
prepare stmt1 from "select * from t1 where c1=?";
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	10
set @a=1;
execute stmt1 using @a;
c1
1
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	10
set @a=100;
execute stmt1 using @a;
c1
100
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	10
set @a=10;
execute stmt1 using @a;
c1
10
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	10
prepare stmt1 from "select * from t1 where c1=10";
set global query_cache_size=0;
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	10
execute stmt1;
c1
10
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	10
execute stmt1;
c1
10
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	10
execute stmt1;
c1
10
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	10
set global query_cache_size=100000;
execute stmt1;
c1
10
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	10
execute stmt1;
c1
10
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	11
execute stmt1;
c1
10
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	12
set global query_cache_size=0;
prepare stmt1 from "select * from t1 where c1=10";
set global query_cache_size=100000;
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	12
execute stmt1;
c1
10
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	12
execute stmt1;
c1
10
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	12
execute stmt1;
c1
10
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	12
set global query_cache_size=0;
prepare stmt1 from "select * from t1 where c1=?";
set global query_cache_size=100000;
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	12
set @a=1;
execute stmt1 using @a;
c1
1
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	12
set @a=100;
execute stmt1 using @a;
c1
100
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	12
set @a=10;
execute stmt1 using @a;
c1
10
show status like 'Qcache_hits';
Variable_name	Value
Qcache_hits	12
drop table t1;
set global query_cache_size=0;
flush status;

--- New file ---
+++ mysql-test/t/query_cache_sql_prepare.test	07/03/09 18:09:54
# This is to see how statements prepared via the PREPARE SQL command
# go into the query cache: if using parameters they cannot; if not
# using parameters they can.
# Query cache is abbreviated as "QC"

-- source include/have_query_cache.inc

connect (con1,127.0.0.1,root,,test,$MASTER_MYPORT,);
connection default;

set global query_cache_size=100000;
flush status;
create table t1(c1 int);
insert into t1 values(1),(10),(100);

# Prepared statements has no parameters, query caching should happen
prepare stmt1 from "select * from t1 where c1=10";
show status like 'Qcache_hits';
execute stmt1;
show status like 'Qcache_hits';
execute stmt1;
show status like 'Qcache_hits';
execute stmt1;
show status like 'Qcache_hits';
# Another prepared statement (same text, same connection), should hit the QC
prepare stmt2 from "select * from t1 where c1=10";
execute stmt2;
show status like 'Qcache_hits';
execute stmt2;
show status like 'Qcache_hits';
execute stmt2;
show status like 'Qcache_hits';
# Another prepared statement (same text, other connection), should hit the QC
connection con1;
prepare stmt3 from "select * from t1 where c1=10";
execute stmt3;
show status like 'Qcache_hits';
execute stmt3;
show status like 'Qcache_hits';
execute stmt3;
show status like 'Qcache_hits';
connection default;
# A non-prepared statement (same text, same connection), should hit
# the QC (as it uses the text protocol like SQL EXECUTE).
# But if it uses the binary protocol, it will not hit. So we make sure
# that it uses the text protocol:
-- disable_ps_protocol
select * from t1 where c1=10;
show status like 'Qcache_hits';
 # A non-prepared statement (same text, other connection), should hit
# the QC. To test that it hits the result of SQL EXECUTE, we need to
# empty/repopulate the QC (to remove the result from the non-prepared
# SELECT just above).
flush tables;
execute stmt1;
show status like 'Qcache_hits';
connection con1;
select * from t1 where c1=10;
show status like 'Qcache_hits';
-- enable_ps_protocol
connection default;

# Prepared statement has parameters, query caching should not happen
prepare stmt1 from "select * from t1 where c1=?";
show status like 'Qcache_hits';
set @a=1;
execute stmt1 using @a;
show status like 'Qcache_hits';
set @a=100;
execute stmt1 using @a;
show status like 'Qcache_hits';
set @a=10;
execute stmt1 using @a;
show status like 'Qcache_hits';

# See if enabling/disabling the query cache between PREPARE and
# EXECUTE is an issue; the expected result is that the query cache
# will not be used.
# Indeed, decision to read/write the query cache is taken at PREPARE
# time, so if the query cache was disabled at PREPARE time then no
# execution of the statement will read/write the query cache.
# If the query cache was enabled at PREPARE time, but disabled at
# EXECUTE time, at EXECUTE time the query cache internal functions do
# nothing so again the query cache is not read/written. But if the
# query cache is re-enabled before another execution then that
# execution will read/write the query cache.

# QC is enabled at PREPARE
prepare stmt1 from "select * from t1 where c1=10";
# then QC is disabled at EXECUTE
set global query_cache_size=0;
show status like 'Qcache_hits';
execute stmt1;
show status like 'Qcache_hits';
execute stmt1;
show status like 'Qcache_hits';
execute stmt1;
show status like 'Qcache_hits';
# then QC is re-enabled for more EXECUTE.
set global query_cache_size=100000;
# Note that this execution will not hit results from the
# beginning of the test (because QC has been emptied meanwhile by
# setting its size to 0).
execute stmt1;
show status like 'Qcache_hits';
execute stmt1;
show status like 'Qcache_hits';
execute stmt1;
show status like 'Qcache_hits';

# QC is disabled at PREPARE
set global query_cache_size=0;
prepare stmt1 from "select * from t1 where c1=10";
# then QC is enabled at EXECUTE
set global query_cache_size=100000;
show status like 'Qcache_hits';
execute stmt1;
show status like 'Qcache_hits';
execute stmt1;
show status like 'Qcache_hits';
execute stmt1;
show status like 'Qcache_hits';

# QC is disabled at PREPARE
set global query_cache_size=0;
prepare stmt1 from "select * from t1 where c1=?";
# then QC is enabled at EXECUTE
set global query_cache_size=100000;
show status like 'Qcache_hits';
set @a=1;
execute stmt1 using @a;
show status like 'Qcache_hits';
set @a=100;
execute stmt1 using @a;
show status like 'Qcache_hits';
set @a=10;
execute stmt1 using @a;
show status like 'Qcache_hits';


drop table t1;

set global query_cache_size=0;
flush status; # reset Qcache status variables for next tests


--- 1.84/mysql-test/r/query_cache.result	2007-03-09 18:10:05 +01:00
+++ 1.85/mysql-test/r/query_cache.result	2007-03-09 18:10:05 +01:00
@@ -1325,4 +1325,27 @@ start transaction;
 insert into t1(c1) select c1 from v1;
 drop table t1, t2, t3;
 drop view v1;
+create table t1(c1 int);
+insert into t1 values(1),(10),(100);
+select * from t1;
+c1
+1
+10
+100
+select * from t1;
+c1
+1
+10
+100
+select * from t1;
+c1
+1
+10
+100
+select * from t1;
+c1
+1
+10
+100
+drop table t1;
 set global query_cache_size=0;

--- 1.17/mysql-test/t/grant_cache.test	2007-03-09 18:10:05 +01:00
+++ 1.18/mysql-test/t/grant_cache.test	2007-03-09 18:10:05 +01:00
@@ -1,6 +1,8 @@
 # Grant tests not performed with embedded server
 -- source include/not_embedded.inc
 -- source include/have_query_cache.inc
+# See at the end of the test why we disable the ps protocol (*)
+-- disable_ps_protocol
 
 #
 # Test grants with query cache
@@ -151,3 +153,27 @@ drop database mysqltest;
 set GLOBAL query_cache_size=default;
 
 # End of 4.1 tests
+
+# (*) Why we disable the ps protocol: because in normal protocol,
+# a SELECT failing due to insufficient privileges increments
+# Qcache_not_cached, while in ps-protocol, no.
+# In detail: in normal protocol,
+# the "access denied" errors on SELECT are issued at (stack trace):
+# mysql_parse/mysql_execute_command/execute_sqlcom_select/handle_select/
+# mysql_select/JOIN::prepare/setup_wild/insert_fields/
+# check_grant_all_columns/my_error/my_message_sql, which then calls
+# push_warning/query_cache_abort: at this moment,
+# query_cache_store_query() has been called, so query exists in cache,
+# so thd->net.query_cache_query!=NULL, so query_cache_abort() removes
+# the query from cache, which causes a query_cache.refused++ (thus,
+# a Qcache_not_cached++).
+# While in ps-protocol, the error is issued at prepare time;
+# for this mysql_test_select() is called, not execute_sqlcom_select()
+# (and that also leads to JOIN::prepare/etc). Thus, as
+# query_cache_store_query() has not been called,
+# thd->net.query_cache_query==NULL, so query_cache_abort() does nothing:
+# Qcache_not_cached is not incremented.
+# As this test prints Qcache_not_cached after SELECT failures,
+# we cannot enable this test in ps-protocol.
+
+--enable_ps_protocol

--- 1.65/mysql-test/t/query_cache.test	2007-03-09 18:10:05 +01:00
+++ 1.66/mysql-test/t/query_cache.test	2007-03-09 18:10:05 +01:00
@@ -907,4 +907,24 @@ start transaction;
 insert into t1(c1) select c1 from v1;
 drop table t1, t2, t3;
 drop view v1;
+
+
+#
+# If running with --ps-protocol:
+# see if a query from the text protocol is served with results cached
+# from a query which used the binary (which would be wrong, results
+# are in different formats); if that happens, the results will
+# be incorrect and the test will fail.
+#
+
+create table t1(c1 int);
+insert into t1 values(1),(10),(100);
+select * from t1;
+-- disable_ps_protocol
+select * from t1;
+select * from t1;
+-- enable_ps_protocol
+select * from t1;
+drop table t1;
+
 set global query_cache_size=0;

--- 1.38/sql/protocol.h	2007-03-09 18:10:05 +01:00
+++ 1.39/sql/protocol.h	2007-03-09 18:10:05 +01:00
@@ -98,6 +98,15 @@ public:
 #else
   void remove_last_row() {}
 #endif
+  enum enum_protocol_type
+  {
+    PROTOCOL_TEXT= 0, PROTOCOL_BINARY= 1
+    /*
+      before adding here or change the values, consider that it is cast to a
+      bit in sql_cache.cc.
+    */
+  };
+  virtual enum enum_protocol_type type()= 0;
 };
 
 
@@ -127,6 +136,7 @@ public:
 #ifdef EMBEDDED_LIBRARY
   void remove_last_row();
 #endif
+  virtual enum enum_protocol_type type() { return PROTOCOL_TEXT; };
 };
 
 
@@ -158,6 +168,7 @@ public:
   virtual bool store(float nr, uint32 decimals, String *buffer);
   virtual bool store(double from, uint32 decimals, String *buffer);
   virtual bool store(Field *field);
+  virtual enum enum_protocol_type type() { return PROTOCOL_BINARY; };
 };
 
 void send_warning(THD *thd, uint sql_errno, const char *err=0);

--- 1.5/mysql-test/t/ndb_cache_multi2.test	2007-03-09 18:10:05 +01:00
+++ 1.6/mysql-test/t/ndb_cache_multi2.test	2007-03-09 18:10:05 +01:00
@@ -36,7 +36,11 @@ insert into t1 value (2);
 insert into t2 value (3);
 select * from t1;
 # Run the check query once to load it into qc on server1
+# See at the end of this test why we need to disable ps-protocol for
+# this query (*)
+--disable_ps_protocol
 select a != 3 from t1;
+--enable_ps_protocol
 select * from t2;
 show status like "Qcache_queries_in_cache";
 show status like "Qcache_inserts";
@@ -93,3 +97,30 @@ set GLOBAL query_cache_size=0;
 set GLOBAL ndb_cache_check_time=0;
 reset query cache;
 flush status;
+
+# (*) Why we need to execute the query in non-ps mode.
+# The principle of this test is: two mysqlds connected to one cluster,
+# both using their query cache. Queries are cached in server1
+# ("select a!=3 from t1", "select * from t1"),
+# table t1 is modified in server2, we want to see that this invalidates
+# the query cache of server1. Invalidation with NDB works like this:
+# when a query is found in the query cache, NDB is asked if the tables
+# have changed. In this test, ha_ndbcluster calls NDB every millisecond
+# to collect change information about tables.
+# Due to this millisecond delay, there is need for a loop ("while...")
+# in this test, which waits until a query1 ("select a!=3 from t1") is
+# invalidated (which is equivalent to it returning
+# up-to-date results), and then expects query2 ("select * from t1")
+# to have been invalidated (see up-to-date results).
+# But when enabling --ps-protocol in this test, the logic breaks,
+# because query1 is still done via mysql_real_query() (see mysqltest.c:
+# eval_expr() always uses mysql_real_query()). So, query1 returning
+# up-to-date results is not a sign of it being invalidated in the cache,
+# because it was NOT in the cache ("select a!=3 from t1" on line 39
+# was done with prep stmts, while `select a!=3 from t1` is not,
+# thus the second does not see the first in the cache). Thus, we may run
+# query2 when cache still has not been invalidated.
+# The solution is to make the initial "select a!=3 from t1" run
+# as a normal query, this repairs the broken logic.
+# But note, "select * from t1" is still using prepared statements
+# which was the goal of this test with --ps-protocol.

--- 1.205/sql/sql_prepare.cc	2007-03-09 18:10:05 +01:00
+++ 1.206/sql/sql_prepare.cc	2007-03-09 18:10:05 +01:00
@@ -691,7 +691,7 @@ static void setup_one_conversion_functio
     and generate a valid query for logging.
 
   NOTES
-    This function, along with other _withlog functions is called when one of
+    This function, along with other _with_log functions is called when one of
     binary, slow or general logs is open. Logging of prepared statements in
     all cases is performed by means of conventional queries: if parameter
     data was supplied from C API, each placeholder in the query is
@@ -715,9 +715,9 @@ static void setup_one_conversion_functio
    0 if success, 1 otherwise
 */
 
-static bool insert_params_withlog(Prepared_statement *stmt, uchar *null_array,
-                                  uchar *read_pos, uchar *data_end,
-                                  String *query)
+static bool insert_params_with_log(Prepared_statement *stmt, uchar *null_array,
+                                   uchar *read_pos, uchar *data_end,
+                                   String *query)
 {
   THD  *thd= stmt->thd;
   Item_param **begin= stmt->param_array;
@@ -725,7 +725,7 @@ static bool insert_params_withlog(Prepar
   uint32 length= 0;
   String str;
   const String *res;
-  DBUG_ENTER("insert_params_withlog");
+  DBUG_ENTER("insert_params_with_log");
 
   if (query->copy(stmt->query, stmt->query_length, default_charset_info))
     DBUG_RETURN(1);
@@ -869,7 +869,8 @@ static bool emb_insert_params(Prepared_s
 }
 
 
-static bool emb_insert_params_withlog(Prepared_statement *stmt, String *query)
+static bool emb_insert_params_with_log(Prepared_statement *stmt,
+                                       String *query)
 {
   THD *thd= stmt->thd;
   Item_param **it= stmt->param_array;
@@ -880,7 +881,7 @@ static bool emb_insert_params_withlog(Pr
   const String *res;
   uint32 length= 0;
 
-  DBUG_ENTER("emb_insert_params_withlog");
+  DBUG_ENTER("emb_insert_params_with_log");
 
   if (query->copy(stmt->query, stmt->query_length, default_charset_info))
     DBUG_RETURN(1);
@@ -2692,15 +2693,26 @@ Prepared_statement::Prepared_statement(T
 
 void Prepared_statement::setup_set_params()
 {
-  /* Setup binary logging */
+  /*
+    Note: BUG#25843 applies here too (query cache lookup uses thd->db, not
+    db from "prepare" time).
+  */
+  if (query_cache_maybe_disabled(thd)) // we won't expand the query
+    lex->safe_to_cache_query= FALSE;   // so don't cache it at Execution
+
+  /*
+    Decide if we have to expand the query (because we must write it to logs or
+    because we want to look it up in the query cache) or not.
+  */
   if (mysql_bin_log.is_open() && is_update_query(lex->sql_command) ||
-      opt_log || opt_slow_log)
+      opt_log || opt_slow_log ||
+      query_cache_is_cacheable_query(lex))
   {
     set_params_from_vars= insert_params_from_vars_with_log;
 #ifndef EMBEDDED_LIBRARY
-    set_params= insert_params_withlog;
+    set_params= insert_params_with_log;
 #else
-    set_params_data= emb_insert_params_withlog;
+    set_params_data= emb_insert_params_with_log;
 #endif
   }
   else
@@ -2837,7 +2849,6 @@ bool Prepared_statement::prepare(const c
   error= MYSQLparse((void *)thd) || thd->is_fatal_error ||
       thd->net.report_error || init_param_array(this);
 
-  lex->safe_to_cache_query= FALSE;
   /*
     While doing context analysis of the query (in check_prepared_statement)
     we allocate a lot of additional memory: for open tables, JOINs, derived
@@ -2880,6 +2891,18 @@ bool Prepared_statement::prepare(const c
   thd->restore_backup_statement(this, &stmt_backup);
   thd->stmt_arena= old_stmt_arena;
 
+  if ((protocol->type() == Protocol::PROTOCOL_TEXT) && (param_count > 0))
+  {
+    /*
+      This is a mysql_sql_stmt_prepare(); query expansion will insert user
+      variable references, and user variables are uncacheable, thus we have to
+      mark this statement as uncacheable.
+      This has to be done before setup_set_params(), as it may make expansion
+      unneeded.
+    */
+    lex->safe_to_cache_query= FALSE;
+  }
+
   if (error == 0)
   {
     setup_set_params();
@@ -2996,10 +3019,25 @@ bool Prepared_statement::execute(String 
   reinit_stmt_before_use(thd, lex);
 
   thd->protocol= protocol;                      /* activate stmt protocol */
-  error= (open_cursor ?
-          mysql_open_cursor(thd, (uint) ALWAYS_MATERIALIZED_CURSOR,
-                            &result, &cursor) :
-          mysql_execute_command(thd));
+
+  if (open_cursor)
+    error= mysql_open_cursor(thd, (uint) ALWAYS_MATERIALIZED_CURSOR,
+                             &result, &cursor);
+  else
+  {
+    /*
+      Try to find it in the query cache, if not, execute it.
+      Note that multi-statements cannot exist here (they are not supported in
+      prepared statements).
+    */
+    if (query_cache_send_result_to_client(thd, thd->query,
+                                          thd->query_length) <= 0)
+    {
+      error= mysql_execute_command(thd);
+      query_cache_end_of_result(thd);
+    }
+  }
+
   thd->protocol= &thd->protocol_text;         /* use normal protocol */
 
   /* Assert that if an error, no cursor is open */

--- 1.229/tests/mysql_client_test.c	2007-03-09 18:10:05 +01:00
+++ 1.230/tests/mysql_client_test.c	2007-03-09 18:10:05 +01:00
@@ -2354,6 +2354,271 @@ static void test_ps_conj_select()
 }
 
 
+/* reads Qcache_hits from server and returns its value */
+static uint query_cache_hits(MYSQL *conn)
+{
+  MYSQL_RES *res;
+  MYSQL_ROW row;
+  int rc;
+  uint result;
+
+  rc= mysql_query(conn, "show status like 'qcache_hits'");
+  myquery(rc);
+  res= mysql_use_result(conn);
+  DIE_UNLESS(res);
+
+  row= mysql_fetch_row(res);
+  DIE_UNLESS(row);
+
+  result= atoi(row[1]);
+  mysql_free_result(res);
+  return result;
+}
+
+
+/*
+  utility for the next test; expects 3 rows in the result from a SELECT,
+  compares each row/field with an expected value.
+ */
+#define test_ps_query_cache_result(i1,s1,l1,i2,s2,l2,i3,s3,l3)    \
+  r_metadata= mysql_stmt_result_metadata(stmt);                   \
+  DIE_UNLESS(r_metadata != NULL);                                 \
+  rc= mysql_stmt_fetch(stmt);                                     \
+  check_execute(stmt, rc);                                        \
+  if (!opt_silent)                                                \
+    fprintf(stdout, "\n row 1: %d, %s(%lu)", r_int_data,          \
+            r_str_data, r_str_length);                            \
+  DIE_UNLESS((r_int_data == i1) && (r_str_length == l1) &&        \
+             (strcmp(r_str_data, s1) == 0));                      \
+  rc= mysql_stmt_fetch(stmt);                                     \
+  check_execute(stmt, rc);                                        \
+  if (!opt_silent)                                                \
+    fprintf(stdout, "\n row 2: %d, %s(%lu)", r_int_data,          \
+            r_str_data, r_str_length);                            \
+  DIE_UNLESS((r_int_data == i2) && (r_str_length == l2) &&        \
+             (strcmp(r_str_data, s2) == 0));                      \
+  rc= mysql_stmt_fetch(stmt);                                     \
+  check_execute(stmt, rc);                                        \
+  if (!opt_silent)                                                \
+    fprintf(stdout, "\n row 3: %d, %s(%lu)", r_int_data,          \
+            r_str_data, r_str_length);                            \
+  DIE_UNLESS((r_int_data == i3) && (r_str_length == l3) &&        \
+             (strcmp(r_str_data, s3) == 0));                      \
+  rc= mysql_stmt_fetch(stmt);                                     \
+  DIE_UNLESS(rc == MYSQL_NO_DATA);                                \
+  mysql_free_result(r_metadata);
+
+
+/*
+  Test that prepared statements make use of the query cache just as normal
+  statements (BUG#735).
+*/
+static void test_ps_query_cache()
+{
+  MYSQL      *org_mysql= mysql, *lmysql;
+  MYSQL_STMT *stmt;
+  int        rc;
+  MYSQL_BIND p_bind[2],r_bind[2]; /* p: param bind; r: result bind */
+  int32      p_int_data, r_int_data;
+  char       p_str_data[32], r_str_data[32];
+  unsigned long p_str_length, r_str_length;
+  MYSQL_RES  *r_metadata;
+  char       query[MAX_TEST_QUERY_LENGTH];
+  uint       hits1, hits2;
+  enum enum_test_ps_query_cache
+  {
+    /*
+      We iterate the same prepare/executes block, but have iterations where
+      we vary the query cache conditions.
+    */
+    /* the query cache is enabled for the duration of prep&execs: */
+    TEST_QCACHE_ON= 0,
+    /*
+      same but using a new connection (to see if qcache serves results from
+      the previous connection as it should):
+    */
+    TEST_QCACHE_ON_WITH_OTHER_CONN,
+    /*
+      First border case: disables the query cache before prepare and
+      re-enables it before execution (to test if we have no bug then):
+    */
+    TEST_QCACHE_OFF_ON,
+    /*
+      Second border case: enables the query cache before prepare and
+      disables it before execution:
+    */
+    TEST_QCACHE_ON_OFF
+  };
+  enum enum_test_ps_query_cache iteration;
+  LINT_INIT(lmysql);
+
+  myheader("test_ps_query_cache");
+
+  /* prepare the table */
+
+  rc= mysql_query(mysql, "drop table if exists t1");
+  myquery(rc);
+
+  rc= mysql_query(mysql, "create table t1 (id1 int(11) NOT NULL default '0', "
+                         "value2 varchar(100), value1 varchar(100))");
+  myquery(rc);
+
+  rc= mysql_query(mysql, "insert into t1 values (1, 'hh', 'hh'), "
+                          "(2, 'hh', 'hh'), (1, 'ii', 'ii'), (2, 'ii', 'ii')");
+  myquery(rc);
+
+  for (iteration= TEST_QCACHE_ON; iteration < TEST_QCACHE_ON_OFF; iteration++)
+  {
+
+    switch (iteration)
+    {
+    case TEST_QCACHE_ON:
+    case TEST_QCACHE_ON_OFF:
+      rc= mysql_query(mysql, "set global query_cache_size=1000000");
+      myquery(rc);
+      break;
+    case TEST_QCACHE_OFF_ON:
+      rc= mysql_query(mysql, "set global query_cache_size=0");
+      myquery(rc);
+      break;
+    case TEST_QCACHE_ON_WITH_OTHER_CONN:
+      if (!opt_silent)
+        fprintf(stdout, "\n Establishing a test connection ...");
+      if (!(lmysql= mysql_init(NULL)))
+      {
+        myerror("mysql_init() failed");
+        exit(1);
+      }
+      if (!(mysql_real_connect(lmysql, opt_host, opt_user,
+                               opt_password, current_db, opt_port,
+                               opt_unix_socket, 0)))
+      {
+        myerror("connection failed");
+        mysql_close(lmysql);
+        exit(1);
+      }
+      if (!opt_silent)
+        fprintf(stdout, " OK");
+      mysql= lmysql;
+    }
+
+    strmov(query, "select id1, value1 from t1 where id1= ? or "
+           "CONVERT(value1 USING utf8)= ?");
+    stmt= mysql_simple_prepare(mysql, query);
+    check_stmt(stmt);
+
+    verify_param_count(stmt, 2);
+
+    switch(iteration)
+    {
+    case TEST_QCACHE_OFF_ON:
+      rc= mysql_query(mysql, "set global query_cache_size=1000000");
+      myquery(rc);
+      break;
+    case TEST_QCACHE_ON_OFF:
+      rc= mysql_query(mysql, "set global query_cache_size=0");
+      myquery(rc);
+    default:
+      break;
+    }
+
+    bzero((char*) p_bind, sizeof(p_bind));
+    p_bind[0].buffer_type= MYSQL_TYPE_LONG;
+    p_bind[0].buffer= (void *)&p_int_data;
+    p_bind[1].buffer_type= MYSQL_TYPE_VAR_STRING;
+    p_bind[1].buffer= (void *)p_str_data;
+    p_bind[1].buffer_length= array_elements(p_str_data);
+    p_bind[1].length= &p_str_length;
+
+    rc= mysql_stmt_bind_param(stmt, p_bind);
+    check_execute(stmt, rc);
+
+    p_int_data= 1;
+    strmov(p_str_data, "hh");
+    p_str_length= strlen(p_str_data);
+
+    bzero((char*) r_bind, sizeof(r_bind));
+    r_bind[0].buffer_type= MYSQL_TYPE_LONG;
+    r_bind[0].buffer= (void *)&r_int_data;
+    r_bind[1].buffer_type= MYSQL_TYPE_VAR_STRING;
+    r_bind[1].buffer= (void *)r_str_data;
+    r_bind[1].buffer_length= array_elements(r_str_data);
+    r_bind[1].length= &r_str_length;
+
+    rc= mysql_stmt_bind_result(stmt, r_bind);
+    check_execute(stmt, rc);
+
+    rc= mysql_stmt_execute(stmt);
+    check_execute(stmt, rc);
+
+    test_ps_query_cache_result(1, "hh", 2, 2, "hh", 2, 1, "ii", 2);
+
+    /* now retry with the same parameter values and see qcache hits */
+    hits1= query_cache_hits(mysql);
+    rc= mysql_stmt_execute(stmt);
+    check_execute(stmt, rc);
+    test_ps_query_cache_result(1, "hh", 2, 2, "hh", 2, 1, "ii", 2);
+    hits2= query_cache_hits(mysql);
+    switch(iteration)
+    {
+    case TEST_QCACHE_ON_WITH_OTHER_CONN:
+    case TEST_QCACHE_ON:                 /* should have hit */
+      DIE_UNLESS(hits2-hits1 == 1);
+      break;
+    case TEST_QCACHE_OFF_ON:
+    case TEST_QCACHE_ON_OFF:             /* should not have hit */
+      DIE_UNLESS(hits2-hits1 == 0);
+    }
+
+    /* now modify parameter values and see qcache hits */
+    strmov(p_str_data, "ii");
+    p_str_length= strlen(p_str_data);
+    rc= mysql_stmt_execute(stmt);
+    check_execute(stmt, rc);
+    test_ps_query_cache_result(1, "hh", 2, 1, "ii", 2, 2, "ii", 2);
+    hits1= query_cache_hits(mysql);
+
+    switch(iteration)
+    {
+    case TEST_QCACHE_ON:
+    case TEST_QCACHE_OFF_ON:
+    case TEST_QCACHE_ON_OFF:             /* should not have hit */
+      DIE_UNLESS(hits2-hits1 == 0);
+      break;
+    case TEST_QCACHE_ON_WITH_OTHER_CONN: /* should have hit */
+      DIE_UNLESS(hits1-hits2 == 1);
+    }
+
+    rc= mysql_stmt_execute(stmt);
+    check_execute(stmt, rc);
+
+    test_ps_query_cache_result(1, "hh", 2, 1, "ii", 2, 2, "ii", 2);
+    hits2= query_cache_hits(mysql);
+
+    mysql_stmt_close(stmt);
+
+    switch(iteration)
+    {
+    case TEST_QCACHE_ON:                 /* should have hit */
+      DIE_UNLESS(hits2-hits1 == 1);
+      break;
+    case TEST_QCACHE_OFF_ON:
+    case TEST_QCACHE_ON_OFF:             /* should not have hit */
+      DIE_UNLESS(hits2-hits1 == 0);
+      break;
+    case TEST_QCACHE_ON_WITH_OTHER_CONN:
+      mysql_close(lmysql);
+      mysql= org_mysql;
+    }
+
+  } /* for(iteration=...) */
+
+  rc= mysql_query(mysql, "set global query_cache_size=0");
+  myquery(rc);
+
+}
+
+
 /* Test BUG#1115 (incorrect string parameter value allocation) */
 
 static void test_bug1115()
@@ -4722,7 +4987,7 @@ static void test_stmt_close()
     close statements by hand once mysql_close() had been called.
     Now mysql_close() doesn't free any statements, so this test doesn't
     serve its original designation any more.
-    Here we free stmt2 and stmt3 by hande to avoid memory leaks.
+    Here we free stmt2 and stmt3 by hand to avoid memory leaks.
   */
   mysql_stmt_close(stmt2);
   mysql_stmt_close(stmt3);
@@ -16067,8 +16332,9 @@ static struct my_tests_st my_tests[]= {
   { "test_bug15518", test_bug15518 },
   { "test_bug23383", test_bug23383 },
   { "test_bug21635", test_bug21635 },
-  { "test_status", test_status},
+  { "test_status",   test_status   },
   { "test_bug24179", test_bug24179 },
+  { "test_ps_query_cache", test_ps_query_cache },
   { 0, 0 }
 };
 
Thread
bk commit into 5.1 tree (guilhem:1.2463) BUG#735Guilhem Bichot9 Mar