diff options
| author | unknown <serg@serg.mylan> | 2003-04-30 14:15:24 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-04-30 14:15:24 +0200 |
| commit | a20b167cae50d938914f0a024bf31546305d17cb (patch) | |
| tree | ecd60ac8d85af8e4717860975ba473bea18a712f | |
| parent | 4ceb257849cca35b781cf4a3e8a65811efa878d7 (diff) | |
| download | mariadb-git-a20b167cae50d938914f0a024bf31546305d17cb.tar.gz | |
make compilation to work w/o InnoDB as well
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | sql/handler.cc | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 085c67a176c..b6f9647ea49 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -87,6 +87,7 @@ salle@geopard.(none) salle@geopard.online.bg sasha@mysql.sashanet.com serg@build.mysql2.com +serg@serg.mylan serg@serg.mysql.com serg@sergbook.mysql.com sinisa@rhols221.adsl.netsonic.fi diff --git a/sql/handler.cc b/sql/handler.cc index 762e07eec64..e4317506ed7 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -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 @@ int handler::delete_all_rows() 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) |