diff options
author | unknown <guilhem@gbichot3.local> | 2006-12-18 21:04:35 +0100 |
---|---|---|
committer | unknown <guilhem@gbichot3.local> | 2006-12-18 21:04:35 +0100 |
commit | 51bb36a0e2200a56d7dc9cb83b79c81f996a00d9 (patch) | |
tree | 7a864dde21704080d6914c9071db33518e42aa4e /include/my_base.h | |
parent | f7e7f20ba8df2767ca057510793bc523e88489d9 (diff) | |
parent | 7199c905590391f64802913369aab7d288eff4c8 (diff) | |
download | mariadb-git-51bb36a0e2200a56d7dc9cb83b79c81f996a00d9.tar.gz |
Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean
into gbichot3.local:/home/mysql_src/mysql-maria
BitKeeper/etc/ignore:
auto-union
BUILD/SETUP.sh:
Auto merged
Makefile.am:
Auto merged
config/ac-macros/plugins.m4:
Auto merged
configure.in:
Auto merged
include/Makefile.am:
Auto merged
include/my_base.h:
Auto merged
include/my_dbug.h:
Auto merged
include/my_global.h:
Auto merged
include/my_sys.h:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysys/Makefile.am:
Auto merged
mysys/my_pread.c:
Auto merged
sql/Makefile.am:
Auto merged
sql/handler.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/unireg.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/ha_myisam.h:
Auto merged
storage/myisam/mi_open.c:
Auto merged
storage/myisam/mi_packrec.c:
Auto merged
storage/myisam/mi_range.c:
Auto merged
storage/myisam/myisampack.c:
Auto merged
storage/myisam/sort.c:
Auto merged
storage/myisammrg/ha_myisammrg.h:
Auto merged
unittest/mytap/tap.c:
Auto merged
include/myisam.h:
merge
sql/mysqld.cc:
merge
storage/myisam/mi_check.c:
merge
storage/myisam/myisamdef.h:
merge
Diffstat (limited to 'include/my_base.h')
-rw-r--r-- | include/my_base.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/my_base.h b/include/my_base.h index cf254f5e0d0..63af3bf228d 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -15,7 +15,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* This file includes constants used with all databases */ -/* Author: Michael Widenius */ #ifndef _my_base_h #define _my_base_h @@ -492,4 +491,7 @@ typedef ulong ha_rows; #define HA_VARCHAR_PACKLENGTH(field_length) ((field_length) < 256 ? 1 :2) +/* invalidator function reference for Query Cache */ +typedef void (* invalidator_by_filename)(const char * filename); + #endif /* _my_base_h */ |