bk commit into 4.1 tree (1.1525)

Below is the list of changes that have just been committed into a local
4.1 repository of serg. When serg 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.1525 03/04/30 14:15:24 serg@xxxxxxxxxx +2 -0
  make compilation to work w/o InnoDB as well 

  BitKeeper/etc/logging_ok
    1.246 03/04/30 14:15:24 serg@xxxxxxxxxx +1 -0
    Logging to logging@xxxxxxxxxxxxxxx accepted

  sql/handler.cc
    1.89 03/04/30 14:15:18 serg@xxxxxxxxxx +3 -1
    make compilation to work w/o InnoDB as well 

# 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: serg
# Host: serg.mylan
# Root: /usr/home/serg/Abk/mysql-4.1

--- 1.88/sql/handler.cc Wed Apr 16 19:33:44 2003
+++ 1.89/sql/handler.cc Wed Apr 30 14:15:18 2003
@@ -34,6 +34,8 @@
 #endif
 #ifdef HAVE_INNOBASE_DB
 #include "ha_innodb.h"
+#else
+#define innobase_query_caching_of_table_permitted(X,Y,Z) 1
 #endif
 #include <myisampack.h>
 #include <errno.h>
@@ -877,7 +879,7 @@
   return (my_errno=HA_ERR_WRONG_COMMAND);
 }
 
-bool handler::caching_allowed(THD* thd, char* table_key, 
+bool handler::caching_allowed(THD* thd, char* table_key,
                              uint key_length, uint8 cache_type)
 {
   if (cache_type == HA_CACHE_TBL_ASKTRANSACT)

--- 1.245/BitKeeper/etc/logging_ok      Mon Apr 28 19:40:41 2003
+++ 1.246/BitKeeper/etc/logging_ok      Wed Apr 30 14:15:24 2003
@@ -87,6 +87,7 @@
 salle@xxxxxxxxxxxxxxxxx
 sasha@xxxxxxxxxxxxxxxxxx
 serg@xxxxxxxxxxxxxxxx
+serg@xxxxxxxxxx
 serg@xxxxxxxxxxxxxx
 serg@xxxxxxxxxxxxxxxxxx
 sinisa@xxxxxxxxxxxxxxxxxxxxxxxxx

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    
http://lists.mysql.com/internals?unsub=gcdmd-internals@xxxxxxxxxxx