List:Maria Storage Engine« Previous MessageNext Message »
From:Guilhem Bichot Date:July 10 2008 2:38pm
Subject:bzr commit into MySQL/Maria:mysql-maria branch (guilhem:2661)
View as plain text  
#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-maria/

 2661 Guilhem Bichot	2008-07-10
      missing DBUG_RETURN, was causing crashes when run with --default-storage-engine=maria in tests
      main.func_misc main.grant_cache_no_prot main.lowercase_table_grant main.mysql_client_test main.query_cache
      main.query_cache_notembedded main.query_cache_ps_no_prot
modified:
  storage/maria/ha_maria.cc

per-file messages:
  storage/maria/ha_maria.cc
    missing DBUG_RETURN
=== modified file 'storage/maria/ha_maria.cc'
--- a/storage/maria/ha_maria.cc	2008-07-09 20:47:46 +0000
+++ b/storage/maria/ha_maria.cc	2008-07-10 14:38:14 +0000
@@ -3138,15 +3138,9 @@ my_bool ha_maria::register_query_cache_t
   actual_data_file_length= file->s->state.state.data_file_length;
   current_data_file_length= file->state->data_file_length;
 
-  if (file->s->non_transactional_concurrent_insert &&
-      current_data_file_length != actual_data_file_length)
-  {
-    /* Don't cache current statement. */
-    return FALSE;
-  }
-
-  /* It is ok to try to cache current statement. */
-  return TRUE;
+  /* Return whether is ok to try to cache current statement. */
+  DBUG_RETURN(!(file->s->non_transactional_concurrent_insert &&
+                current_data_file_length != actual_data_file_length));
 }
 #endif
 

Thread
bzr commit into MySQL/Maria:mysql-maria branch (guilhem:2661) Guilhem Bichot10 Jul