From 5f458f9bf3e2c44178a022baf914f8bd3faaf332 Mon Sep 17 00:00:00 2001
From: rspadim <roberto@spadim.com.br>
Date: Tue, 7 Oct 2014 19:19:59 -0300
Subject: [PATCH] Update ha_maria.cc

MDEV 6817 - disable query cache with page row format, an ugly workaround
---
 storage/maria/ha_maria.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc
index 713a31b2ddf23..e81b2707c322e 100644
--- a/storage/maria/ha_maria.cc
+++ b/storage/maria/ha_maria.cc
@@ -24,7 +24,7 @@
 #include <mysql/plugin.h>
 #include <m_ctype.h>
 #include <my_dir.h>
-#include <myisampack.h>
+#include <myisampack.h>qu
 #include <my_bit.h>
 #include "ha_maria.h"
 #include "trnman_public.h"
@@ -3562,7 +3562,9 @@ my_bool ha_maria::register_query_cache_table(THD *thd, char *table_name,
   ulonglong actual_data_file_length;
   ulonglong current_data_file_length;
   DBUG_ENTER("ha_maria::register_query_cache_table");
-
+  
+  if (file->s->data_file_type==ROW_TYPE_PAGE) 
+    DBUG_RETURN(FALSE); /* TODO: allow PAGE query cache - MDEV-6817 */
   /*
     No call back function is needed to determine if a cached statement
     is valid or not.