From 45b9fa4a8a4936fb5a12079fcd88f5a15511c1c0 Mon Sep 17 00:00:00 2001
From: Olivier Bertrand <bertrandop@gmail.com>
Date: Thu, 12 Mar 2020 23:25:18 +0100
Subject: [PATCH] Fix compile error in tabcmg.cpp

---
 storage/connect/ha_connect.cc | 4 ----
 storage/connect/tabcmg.cpp    | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc
index d1b409e5143..20f96d03f32 100644
--- a/storage/connect/ha_connect.cc
+++ b/storage/connect/ha_connect.cc
@@ -170,11 +170,7 @@
 #define JSONMAX      10             // JSON Default max grp size
 
 extern "C" {
-<<<<<<< HEAD
-       char version[]= "Version 1.06.0010 August 22, 2019";
-=======
        char version[]= "Version 1.07.0001 November 12, 2019";
->>>>>>> 51e9381dcc01ebd72d4f0adc057a64213f850d70
 #if defined(__WIN__)
        char compver[]= "Version 1.07.0001 " __DATE__ " "  __TIME__;
        char slash= '\\';
diff --git a/storage/connect/tabcmg.cpp b/storage/connect/tabcmg.cpp
index b9b7f6e4b60..f2ff721627c 100644
--- a/storage/connect/tabcmg.cpp
+++ b/storage/connect/tabcmg.cpp
@@ -26,6 +26,8 @@
 #include "tabmul.h"
 #include "filter.h"
 
+PQRYRES MGOColumns(PGLOBAL g, PCSZ db, PCSZ uri, PTOS topt, bool info);
+
 /* -------------------------- Class CMGDISC -------------------------- */
 
 /***********************************************************************/