Fix mistakes in merging.

This commit is contained in:
counterpoint
2015-11-11 11:31:07 +00:00
parent dee20fe077
commit 2183d5d3c5
2 changed files with 105 additions and 107 deletions

View File

@ -56,11 +56,6 @@
static HASHTABLE *buffer_hashtable = NULL;
#endif
/** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
static buffer_object_t* gwbuf_remove_buffer_object(
GWBUF* buf,
buffer_object_t* bufobj);