diff options
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | libmysqld/emb_qcache.cc | 12 | ||||
| -rw-r--r-- | libmysqld/emb_qcache.h | 4 | ||||
| -rw-r--r-- | libmysqld/libmysql.c | 2 |
4 files changed, 10 insertions, 9 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 92a654f7b6e..bd0ff8dcc9a 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -117,6 +117,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/ha_sequence.cc ../sql/ha_sequence.h ../sql/temporary_tables.cc ../sql/session_tracker.cc + ../sql/proxy_protocol.cc ${GEN_SOURCES} ${MYSYS_LIBWRAP_SOURCE} ) diff --git a/libmysqld/emb_qcache.cc b/libmysqld/emb_qcache.cc index 429b16b2dee..74a6337912a 100644 --- a/libmysqld/emb_qcache.cc +++ b/libmysqld/emb_qcache.cc @@ -13,7 +13,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "my_global.h" // HAVE_* +#include "mariadb.h" #include "sql_priv.h" #ifdef HAVE_QUERY_CACHE @@ -28,14 +28,14 @@ void Querycache_stream::store_uchar(uchar c) if (data_end == cur_data) use_next_block(TRUE); *(cur_data++)= c; -#ifndef DBUG_OFF +#ifdef DBUG_ASSERT_EXISTS stored_size++; #endif } void Querycache_stream::store_short(ushort s) { -#ifndef DBUG_OFF +#ifdef DBUG_ASSERT_EXISTS stored_size+= 2; #endif if (data_end - cur_data > 1) @@ -58,7 +58,7 @@ void Querycache_stream::store_short(ushort s) void Querycache_stream::store_int(uint i) { -#ifndef DBUG_OFF +#ifdef DBUG_ASSERT_EXISTS stored_size+= 4; #endif size_t rest_len= data_end - cur_data; @@ -85,7 +85,7 @@ void Querycache_stream::store_int(uint i) void Querycache_stream::store_ll(ulonglong ll) { -#ifndef DBUG_OFF +#ifdef DBUG_ASSERT_EXISTS stored_size+= 8; #endif size_t rest_len= data_end - cur_data; @@ -110,7 +110,7 @@ void Querycache_stream::store_ll(ulonglong ll) void Querycache_stream::store_str_only(const char *str, uint str_len) { -#ifndef DBUG_OFF +#ifdef DBUG_ASSERT_EXISTS stored_size+= str_len; #endif do diff --git a/libmysqld/emb_qcache.h b/libmysqld/emb_qcache.h index 8fd166df88d..d714450feb8 100644 --- a/libmysqld/emb_qcache.h +++ b/libmysqld/emb_qcache.h @@ -22,7 +22,7 @@ class Querycache_stream Query_cache_block *block; uint headers_len; public: -#ifndef DBUG_OFF +#ifdef DBUG_ASSERT_EXISTS Query_cache_block *first_block; uint stored_size; #endif @@ -31,7 +31,7 @@ public: { cur_data= ((uchar*)block)+headers_len; data_end= cur_data + (block->used-headers_len); -#ifndef DBUG_OFF +#ifdef DBUG_ASSERT_EXISTS first_block= ini_block; stored_size= 0; #endif diff --git a/libmysqld/libmysql.c b/libmysqld/libmysql.c index d06b32b0625..13dbc78aedd 100644 --- a/libmysqld/libmysql.c +++ b/libmysqld/libmysql.c @@ -4375,7 +4375,7 @@ static void stmt_update_metadata(MYSQL_STMT *stmt, MYSQL_ROWS *data) MYSQL_FIELD *field; uchar *null_ptr, bit; uchar *row= (uchar*) data->data; -#ifndef DBUG_OFF +#ifdef DBUG_ASSERT_EXISTS uchar *row_end= row + data->length; #endif |