diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
| commit | b4a0b2c2f862ab0de853dc34e1e56f6159043e45 (patch) | |
| tree | 18a0c25fdc9ac0076da19247666414a46434b85e /include/maria.h | |
| parent | 9809f05199aeb0b67991fac41bd86f38730768dc (diff) | |
| download | mariadb-git-b4a0b2c2f862ab0de853dc34e1e56f6159043e45.tar.gz | |
post-merge fixes.
most tests pass.
5.3 merge is next
Diffstat (limited to 'include/maria.h')
| -rw-r--r-- | include/maria.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/maria.h b/include/maria.h index 8e5c485767a..7eae8ae0430 100644 --- a/include/maria.h +++ b/include/maria.h @@ -25,7 +25,7 @@ extern "C" { #include <my_sys.h> #include <m_ctype.h> #include "../storage/maria/ma_pagecache.h" -#include "my_handler.h" +#include "my_compare.h" #include "ft_global.h" #include <myisamchk.h> #include <mysql/plugin.h> @@ -174,9 +174,7 @@ typedef struct st_maria_key /* Internal info about a key */ typedef struct st_maria_keydef /* Key definition with open & info */ { struct st_maria_share *share; /* Pointer to base (set in open) */ -#ifdef THREAD rw_lock_t root_lock; /* locking of tree */ -#endif uint16 keysegs; /* Number of key-segment */ uint16 flag; /* NOSAME, PACK_USED */ @@ -356,11 +354,9 @@ typedef struct st_maria_bit_buff typedef struct st_maria_sort_info { -#ifdef THREAD /* sync things */ pthread_mutex_t mutex; pthread_cond_t cond; -#endif MARIA_HA *info, *new_info; HA_CHECK *param; char *buff; |