List:Internals« Previous MessageNext Message »
From:sinisa Date:January 20 2004 3:01pm
Subject:bk commit into 5.0 tree (Sinisa:1.1652)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of Sinisa. When Sinisa 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1652 04/01/20 17:01:34 Sinisa@stripped +1 -0
  Merge sinisa@stripped:/home/bk/mysql-5.0
  into sinisa.nasamreza.org:/mnt/work/petica

  sql/handler.cc
    1.108 04/01/20 17:01:22 Sinisa@stripped +0 -0
    Auto merged

# 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:	Sinisa
# Host:	sinisa.nasamreza.org
# Root:	/mnt/work/petica/RESYNC

--- 1.107/sql/handler.cc	Thu Dec 18 18:49:15 2003
+++ 1.108/sql/handler.cc	Tue Jan 20 17:01:22 2004
@@ -1115,10 +1115,12 @@
 bool handler::caching_allowed(THD* thd, char* table_key,
 			      uint key_length, uint8 cache_type)
 {
+#ifdef HAVE_INNOBASE_DB
   if (cache_type == HA_CACHE_TBL_ASKTRANSACT)
     return innobase_query_caching_of_table_permitted(thd, table_key,
 						     key_length);
   else
+#endif
     return 1;
 }
 
Thread
bk commit into 5.0 tree (Sinisa:1.1652)sinisa20 Jan