1 files changed, 39 insertions, 30 deletions

diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index 55e96ec0c6d..c08d3eae0e1 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -610,6 +610,7 @@ void query_cache_insert(NET *net, const char *packet, ulong length)
       DBUG_VOID_RETURN;
     }
     header->result(result);
+    header->last_pkt_nr= net->pkt_nr;
     BLOCK_UNLOCK_WR(query_block);
   }
   else
@@ -934,11 +935,16 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length)
 
   /*
     Test if the query is a SELECT
-    (pre-space is removed in dispatch_command)
+    (pre-space is removed in dispatch_command).
+
+    First '/' looks like comment before command it is not
+    frequently appeared in real lihe, consequently we can
+    check all such queries, too.
   */
-  if (my_toupper(system_charset_info, sql[0]) != 'S' || 
-      my_toupper(system_charset_info, sql[1]) != 'E' ||
-      my_toupper(system_charset_info,sql[2]) !='L')
+  if ((my_toupper(system_charset_info, sql[0]) != 'S' || 
+       my_toupper(system_charset_info, sql[1]) != 'E' ||
+       my_toupper(system_charset_info,sql[2]) !='L') &&
+      sql[0] != '/')
   {
     DBUG_PRINT("qcache", ("The statement is not a SELECT; Not cached"));
     goto err;
@@ -1025,7 +1031,6 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length)
   {
     TABLE_LIST table_list;
     TABLE *tmptable;
-
     Query_cache_table *table = block_table->parent;
 
     /*
@@ -1036,8 +1041,9 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length)
     */
     for (tmptable= thd->temporary_tables; tmptable ; tmptable= tmptable->next)
     {
-      if (tmptable->key_length - TMP_TABLE_KEY_EXTRA == table->key_length() &&
-          !memcmp(tmptable->table_cache_key, table->data(),
+      if (tmptable->s->key_length - TMP_TABLE_KEY_EXTRA == 
+          table->key_length() &&
+          !memcmp(tmptable->s->table_cache_key, table->data(),
                   table->key_length()))
       {
         DBUG_PRINT("qcache",
@@ -1057,7 +1063,7 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length)
 
     bzero((char*) &table_list,sizeof(table_list));
     table_list.db = table->db();
-    table_list.alias= table_list.real_name= table->table();
+    table_list.alias= table_list.table_name= table->table();
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
     if (check_table_access(thd,SELECT_ACL,&table_list,1))
     {
@@ -1114,6 +1120,7 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length)
 		       ALIGN_SIZE(sizeof(Query_cache_result))))
       break;					// Client aborted
     result_block = result_block->next;
+    thd->net.pkt_nr= query->last_pkt_nr; // Keep packet number updated
   } while (result_block != first_result_block);
 #else
   {
@@ -1152,7 +1159,7 @@ void Query_cache::invalidate(THD *thd, TABLE_LIST *tables_used,
 
       using_transactions = using_transactions &&
 	(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN));
-      for (; tables_used; tables_used=tables_used->next)
+      for (; tables_used; tables_used= tables_used->next_local)
       {
 	DBUG_ASSERT(!using_transactions || tables_used->table!=0);
 	if (tables_used->derived)
@@ -1184,7 +1191,7 @@ void Query_cache::invalidate(CHANGED_TABLE_LIST *tables_used)
     if (query_cache_size > 0)
     {
       DUMP(this);
-      for (; tables_used; tables_used=tables_used->next)
+      for (; tables_used; tables_used= tables_used->next)
       {
 	invalidate_table((byte*) tables_used->key, tables_used->key_length);
 	DBUG_PRINT("qcache", (" db %s, table %s", tables_used->key,
@@ -1217,7 +1224,7 @@ void Query_cache::invalidate_locked_for_write(TABLE_LIST *tables_used)
     if (query_cache_size > 0)
     {
       DUMP(this);
-      for (; tables_used; tables_used= tables_used->next)
+      for (; tables_used; tables_used= tables_used->next_local)
       {
 	if (tables_used->lock_type & (TL_WRITE_LOW_PRIORITY | TL_WRITE))
 	  invalidate_table(tables_used->table);
@@ -2049,7 +2056,7 @@ void Query_cache::invalidate_table(TABLE_LIST *table_list)
     uint key_length;
     Query_cache_block *table_block;
     key_length=(uint) (strmov(strmov(key,table_list->db)+1,
-			      table_list->real_name) -key)+ 1;
+			      table_list->table_name) -key)+ 1;
 
     // We don't store temporary tables => no key_length+=4 ...
     if ((table_block = (Query_cache_block*)
@@ -2060,7 +2067,7 @@ void Query_cache::invalidate_table(TABLE_LIST *table_list)
 
 void Query_cache::invalidate_table(TABLE *table)
 {
-  invalidate_table((byte*) table->table_cache_key, table->key_length);
+  invalidate_table((byte*) table->s->table_cache_key, table->s->key_length);
 }
 
 void Query_cache::invalidate_table(byte * key, uint32  key_length)
@@ -2103,22 +2110,24 @@ my_bool Query_cache::register_all_tables(Query_cache_block *block,
 
   Query_cache_block_table *block_table = block->table(0);
 
-  for (n=0; tables_used; tables_used=tables_used->next, n++, block_table++)
+  for (n= 0;
+       tables_used;
+       tables_used= tables_used->next_global, n++, block_table++)
   {
     DBUG_PRINT("qcache",
 	       ("table %s, db %s, openinfo at 0x%lx, keylen %u, key at 0x%lx",
-		tables_used->real_name, tables_used->db,
+		tables_used->table_name, tables_used->db,
 		(ulong) tables_used->table,
-		tables_used->table->key_length,
-		(ulong) tables_used->table->table_cache_key));
-    block_table->n=n;
-    if (!insert_table(tables_used->table->key_length,
-		      tables_used->table->table_cache_key, block_table,
+		tables_used->table->s->key_length,
+		(ulong) tables_used->table->s->table_cache_key));
+    block_table->n= n;
+    if (!insert_table(tables_used->table->s->key_length,
+		      tables_used->table->s->table_cache_key, block_table,
 		      tables_used->db_length,
 		      tables_used->table->file->table_cache_type()))
       break;
 
-    if (tables_used->table->db_type == DB_TYPE_MRG_MYISAM)
+    if (tables_used->table->s->db_type == DB_TYPE_MRG_MYISAM)
     {
       ha_myisammrg *handler = (ha_myisammrg *) tables_used->table->file;
       MYRG_INFO *file = handler->myrg_info();
@@ -2650,19 +2659,19 @@ TABLE_COUNTER_TYPE Query_cache::is_cacheable(THD *thd, uint32 query_len,
 			lex->select_lex.options,
 			(int) thd->variables.query_cache_type));
 
-    for (; tables_used; tables_used= tables_used->next)
+    for (; tables_used; tables_used= tables_used->next_global)
     {
       table_count++;
       DBUG_PRINT("qcache", ("table %s, db %s, type %u",
-			  tables_used->real_name,
-			  tables_used->db, tables_used->table->db_type));
+			  tables_used->table_name,
+			  tables_used->db, tables_used->table->s->db_type));
       *tables_type|= tables_used->table->file->table_cache_type();
 
       /*
 	table_alias_charset used here because it depends of
 	lower_case_table_names variable
       */
-      if (tables_used->table->tmp_table != NO_TMP_TABLE ||
+      if (tables_used->table->s->tmp_table != NO_TMP_TABLE ||
 	  (*tables_type & HA_CACHE_TBL_NOCACHE) ||
 	  (tables_used->db_length == 5 &&
 	   my_strnncoll(table_alias_charset, (uchar*)tables_used->db, 6,
@@ -2673,7 +2682,7 @@ TABLE_COUNTER_TYPE Query_cache::is_cacheable(THD *thd, uint32 query_len,
 other non-cacheable table(s)"));
 	DBUG_RETURN(0);
       }
-      if (tables_used->table->db_type == DB_TYPE_MRG_MYISAM)
+      if (tables_used->table->s->db_type == DB_TYPE_MRG_MYISAM)
       {
 	ha_myisammrg *handler = (ha_myisammrg *)tables_used->table->file;
 	MYRG_INFO *file = handler->myrg_info();
@@ -2717,11 +2726,11 @@ my_bool Query_cache::ask_handler_allowance(THD *thd,
 {
   DBUG_ENTER("Query_cache::ask_handler_allowance");
 
-  for (; tables_used; tables_used= tables_used->next)
+  for (; tables_used; tables_used= tables_used->next_global)
   {
     TABLE *table= tables_used->table;
-    if (!ha_caching_allowed(thd, table->table_cache_key,
-                         table->key_length,
+    if (!ha_caching_allowed(thd, table->s->table_cache_key,
+                         table->s->key_length,
                          table->file->table_cache_type()))
     {
       DBUG_PRINT("qcache", ("Handler does not allow caching for %s.%s",
@@ -3166,7 +3175,7 @@ void Query_cache::wreck(uint line, const char *message)
   DBUG_PRINT("warning", ("%5d QUERY CACHE WRECK => DISABLED",line));
   DBUG_PRINT("warning", ("=================================="));
   if (thd)
-    thd->killed = 1;
+    thd->killed= THD::KILL_CONNECTION;
   cache_dump();
   /* check_integrity(0); */ /* Can't call it here because of locks */
   bins_dump();