mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 10:31:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix compile error in tabcmg.cpp

Browse source
This commit is contained in:
Olivier Bertrand 2020-03-12 23:25:18 +01:00
parent 4a8b55330c
commit 45b9fa4a8a
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
storage/connect/ha_connect.cc
View file

@ -170,11 +170,7 @@
#define JSONMAX 10 // JSON Default max grp size #define JSONMAX 10 // JSON Default max grp size
extern "C" { extern "C" {
<<<<<<< HEAD
char version[]= "Version 1.06.0010 August 22, 2019";
=======
char version[]= "Version 1.07.0001 November 12, 2019"; char version[]= "Version 1.07.0001 November 12, 2019";
>>>>>>> 51e9381dcc01ebd72d4f0adc057a64213f850d70
#if defined(__WIN__) #if defined(__WIN__)
char compver[]= "Version 1.07.0001 " __DATE__ " " __TIME__; char compver[]= "Version 1.07.0001 " __DATE__ " " __TIME__;
char slash= '\\'; char slash= '\\';

2
storage/connect/tabcmg.cpp
View file

@ -26,6 +26,8 @@
#include "tabmul.h" #include "tabmul.h"
#include "filter.h" #include "filter.h"
PQRYRES MGOColumns(PGLOBAL g, PCSZ db, PCSZ uri, PTOS topt, bool info);
/* -------------------------- Class CMGDISC -------------------------- */ /* -------------------------- Class CMGDISC -------------------------- */
/***********************************************************************/ /***********************************************************************/