summaryrefslogtreecommitdiff
path: root/storage/innobase/include/sync0sync.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@oracle.com>2011-10-12 09:21:33 +0300
committerMarko Mäkelä <marko.makela@oracle.com>2011-10-12 09:21:33 +0300
commit7667e8f93fc13fdcdfc13727ec61c3f353e61c62 (patch)
tree75bf47b10d4fd0748e3f00996bfccf7b0e602d02 /storage/innobase/include/sync0sync.h
parent9de021c753566259c0e0b2923c6b149a2d1e8734 (diff)
parent41b97529d021957d5f51f77a402a2739dc5b428c (diff)
downloadmariadb-git-7667e8f93fc13fdcdfc13727ec61c3f353e61c62.tar.gz
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'storage/innobase/include/sync0sync.h')
-rw-r--r--storage/innobase/include/sync0sync.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/innobase/include/sync0sync.h b/storage/innobase/include/sync0sync.h
index d9dea0aa63d..b5bf30e758c 100644
--- a/storage/innobase/include/sync0sync.h
+++ b/storage/innobase/include/sync0sync.h
@@ -670,7 +670,6 @@ or row lock! */
#define SYNC_LOG_FLUSH_ORDER 147
#define SYNC_RECV 168
#define SYNC_WORK_QUEUE 162
-#define SYNC_SEARCH_SYS_CONF 161 /* for assigning btr_search_enabled */
#define SYNC_SEARCH_SYS 160 /* NOTE that if we have a memory
heap that can be extended to the
buffer pool, its logical level is