diff options
| author | Michael Widenius <monty@askmonty.org> | 2009-10-14 11:09:56 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2009-10-14 11:09:56 +0300 |
| commit | 75a949fb414f8b3ed851a466d84788085c9dbe42 (patch) | |
| tree | fc434ac8f8707ed8bf569798a7f58a2f8cf331a5 /sql/mysql_priv.h | |
| parent | fb146de092a662a2da11fb7b5b1c1ff9ef8a2c57 (diff) | |
| parent | 9f3a7c30e2cb1d9b4034acd3c57f037162a9976e (diff) | |
| download | mariadb-git-75a949fb414f8b3ed851a466d84788085c9dbe42.tar.gz | |
Automatic merge with 5.1-merge
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 63d5621742e..525ce3fa1d0 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -947,7 +947,6 @@ struct Query_cache_query_flags #define query_cache_abort(A) #define query_cache_end_of_result(A) -#define query_cache_invalidate_by_MyISAM_filename_ref NULL #define query_cache_maybe_disabled(T) 1 #define query_cache_is_cacheable_query(L) 0 #endif /*HAVE_QUERY_CACHE*/ |