From 7c689300317793d1396b7a24f86452882d3180c2 Mon Sep 17 00:00:00 2001 From: Michael Widenius <monty@mariadb.org> Date: Thu, 5 Apr 2018 13:53:46 +0300 Subject: [PATCH] Fix compiler warnings in connect --- storage/connect/ha_connect.cc | 2 +- storage/connect/tabjson.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc index d9772b837dd..1bb689000f8 100644 --- a/storage/connect/ha_connect.cc +++ b/storage/connect/ha_connect.cc @@ -433,7 +433,7 @@ handlerton *connect_hton= NULL; uint GetTraceValue(void) {return (uint)(connect_hton ? THDVAR(current_thd, xtrace) : 0);} bool ExactInfo(void) {return THDVAR(current_thd, exact_info);} -bool CondPushEnabled(void) {return THDVAR(current_thd, cond_push);} +static bool CondPushEnabled(void) {return THDVAR(current_thd, cond_push);} USETEMP UseTemp(void) {return (USETEMP)THDVAR(current_thd, use_tempfile);} int GetConvSize(void) {return THDVAR(current_thd, conv_size);} TYPCONV GetTypeConv(void) {return (TYPCONV)THDVAR(current_thd, type_conv);} diff --git a/storage/connect/tabjson.h b/storage/connect/tabjson.h index 0341c0f8aa0..2ff72905e86 100644 --- a/storage/connect/tabjson.h +++ b/storage/connect/tabjson.h @@ -16,6 +16,7 @@ typedef class JSONDEF *PJDEF; typedef class TDBJSON *PJTDB; typedef class JSONCOL *PJCOL; class TDBJSN; +PQRYRES JSONColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt, bool info); /***********************************************************************/ /* The JSON tree node. Can be an Object or an Array. */