summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Widenius <monty@mariadb.org>2018-04-05 13:53:46 +0300
committerMichael Widenius <monty@mariadb.org>2018-04-05 13:55:28 +0300
commit7c689300317793d1396b7a24f86452882d3180c2 (patch)
tree15d5c0ed39fef0d4adb171e070b2dedd460db2f6
parent1d7b4c268941ec1facef1b82adbff329c08c464d (diff)
downloadmariadb-git-7c689300317793d1396b7a24f86452882d3180c2.tar.gz
Fix compiler warnings in connect
-rw-r--r--storage/connect/ha_connect.cc2
-rw-r--r--storage/connect/tabjson.h1
2 files changed, 2 insertions, 1 deletions
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. */