Fix compile error in tabcmg.cpp

MariaDB · Mar 12, 2020 · 45b9fa4 · 45b9fa4
1 parent 4a8b553
commit 45b9fa4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -26,6 +26,8 @@
 #include "tabmul.h"
 #include "filter.h"
 
+PQRYRES MGOColumns(PGLOBAL g, PCSZ db, PCSZ uri, PTOS topt, bool info);
+
 /* -------------------------- Class CMGDISC -------------------------- */
 
 /***********************************************************************/