diff options
| author | monty@mishka.local <> | 2004-12-22 13:54:39 +0200 |
|---|---|---|
| committer | monty@mishka.local <> | 2004-12-22 13:54:39 +0200 |
| commit | 4f4bbfc279800923299df1fefeb2fcd299fcde90 (patch) | |
| tree | 8e5f08b17957f896c2d4e931e60b57d99c260ed6 /sql/sql_cache.cc | |
| parent | 198dc7a8ec6e220c348bb47e59a2ac7532be18b8 (diff) | |
| parent | 98f2a83539735f1a69680195290adcf02861f073 (diff) | |
| download | mariadb-git-4f4bbfc279800923299df1fefeb2fcd299fcde90.tar.gz | |
Merge with 4.1
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 39ee8f61f1a..26b1eff49e7 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -300,7 +300,6 @@ TODO list: #include <m_ctype.h> #include <my_dir.h> #include <hash.h> -#include "sql_acl.h" #include "ha_myisammrg.h" #ifndef MASTER #include "../srclib/myisammrg/myrg_def.h" @@ -375,7 +374,7 @@ inline Query_cache_block * Query_cache_block_table::block() return (Query_cache_block *)(((byte*)this) - ALIGN_SIZE(sizeof(Query_cache_block_table)*n) - ALIGN_SIZE(sizeof(Query_cache_block))); -}; +} /***************************************************************************** Query_cache_block method(s) |