diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-06-07 12:47:04 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-06-07 12:47:04 +0400 |
| commit | 8a247e963dcaa12b70e9aae0c9f3cb831d30f4a7 (patch) | |
| tree | 4268070936d3c9dbd27165b1d9c1593e17ec0d61 /include/my_base.h | |
| parent | e4ab99764249f90a83c7f384eadc913331c59aee (diff) | |
| parent | 75dce25ca8276f56c45f747c9a9a1b4046b6efca (diff) | |
| download | mariadb-git-8a247e963dcaa12b70e9aae0c9f3cb831d30f4a7.tar.gz | |
Manual merge from mysql-trunk-bugfixing.
Conflicts:
- BUILD/SETUP.sh
- mysql-test/mysql-test-run.pl
- mysql-test/r/partition_error.result
- mysql-test/t/disabled.def
- mysql-test/t/partition_error.test
- sql/share/errmsg-utf8.txt
Diffstat (limited to 'include/my_base.h')
| -rw-r--r-- | include/my_base.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/my_base.h b/include/my_base.h index 7766d4165a2..28dc55b1b84 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -562,6 +562,8 @@ typedef ulong ha_rows; #define HA_VARCHAR_PACKLENGTH(field_length) ((field_length) < 256 ? 1 :2) /* invalidator function reference for Query Cache */ +C_MODE_START typedef void (* invalidator_by_filename)(const char * filename); +C_MODE_END #endif /* _my_base_h */ |