mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
In CONNECT version 1.6.10 NOSQL facility is enhanced by a new way to retrieve NOSQL data.
In addition to files and Mongo collections, JSON as well as XML and CSV data can be retrieved from the net as answers from REST queries. Because it uses and external package (cpprestsdk) this is currently available only to MariaDB servers compiled from source. -- Add compile flags needed on Windows /MD or /MDd (debug) -- Also include some changes needed on Linux modified: storage/connect/CMakeLists.txt - Add the xtrc tracing function modified: storage/connect/global.h modified: storage/connect/plugutil.cpp - Modify tracing to use xtrc and some typo modified: storage/connect/array.cpp modified: storage/connect/block.h modified: storage/connect/restget.cpp - Fix compilation error when ZIP is not supported modified: storage/connect/ha_connect.cc modified: storage/connect/tabfmt.cpp - Add some tracing + typo modified: storage/connect/mycat.cc modified: storage/connect/tabjson.cpp - Add conditional code based on MARIADB This to be able to use the same code in CONNECT and EOM modules modified: storage/connect/osutil.h modified: storage/connect/tabrest.cpp - Replace PlugSetPath by some concat (crashed on Fedora) + typo modified: storage/connect/reldef.cpp - Try to fix test failures modified: zlib/CMakeLists.txt
This commit is contained in:
@@ -2,11 +2,11 @@
|
||||
/* */
|
||||
/* PROGRAM NAME: PLUGUTIL */
|
||||
/* ------------- */
|
||||
/* Version 3.0 */
|
||||
/* Version 3.1 */
|
||||
/* */
|
||||
/* COPYRIGHT: */
|
||||
/* ---------- */
|
||||
/* (C) Copyright to the author Olivier BERTRAND 1993-2017 */
|
||||
/* (C) Copyright to the author Olivier BERTRAND 1993-2019 */
|
||||
/* */
|
||||
/* WHAT THIS PROGRAM DOES: */
|
||||
/* ----------------------- */
|
||||
@@ -110,22 +110,32 @@ ACTIVITY defActivity = { /* Describes activity and language */
|
||||
#include "rcmsg.h"
|
||||
#endif // UNIX
|
||||
|
||||
/**************************************************************************/
|
||||
/* Conditional tracing output function. */
|
||||
/**************************************************************************/
|
||||
void xtrc(uint x, char const *fmt, ...)
|
||||
{
|
||||
if (GetTraceValue() & x) {
|
||||
va_list ap;
|
||||
va_start(ap, fmt);
|
||||
|
||||
vfprintf(stderr, fmt, ap);
|
||||
va_end(ap);
|
||||
} // endif x
|
||||
|
||||
} // end of xtrc
|
||||
|
||||
/**************************************************************************/
|
||||
/* Tracing output function. */
|
||||
/**************************************************************************/
|
||||
void htrc(char const *fmt, ...)
|
||||
{
|
||||
va_list ap;
|
||||
va_start (ap, fmt);
|
||||
void htrc(char const* fmt, ...)
|
||||
{
|
||||
va_list ap;
|
||||
va_start(ap, fmt);
|
||||
|
||||
|
||||
//if (trace == 1)
|
||||
// vfprintf(debug, fmt, ap);
|
||||
//else
|
||||
vfprintf(stderr, fmt, ap);
|
||||
|
||||
va_end (ap);
|
||||
} // end of htrc
|
||||
vfprintf(stderr, fmt, ap);
|
||||
va_end(ap);
|
||||
} // end of htrc
|
||||
|
||||
/***********************************************************************/
|
||||
/* Plug initialization routine. */
|
||||
|
Reference in New Issue
Block a user