mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
- Make function strz return null when LEX_STRING is null
modified: storage/connect/ha_connect.cc - Use NOTE instead of WARNING in connect_assisted_discovery This because MariaDB raise an error when doing so modified: storage/connect/ha_connect.cc modified: storage/connect/tabrest.cpp - Make MONGO tables recognize STRINGIFY and JsonAllPath modified: storage/connect/mongo.cpp modified: storage/connect/mongo.h modified: storage/connect/tabcmg.h modified: storage/connect/tabjmg.cpp modified: storage/connect/tabcmg.cpp modified: storage/connect/tabjmg.h - Fix OBJECT option for Pretty != 2 JSN and BSON tables Accept all syntaxes for the OBJECT option modified: storage/connect/tabbson.cpp modified: storage/connect/tabjson.cpp - Use my_snprintf in function xcurl (by vuvova) modified: storage/connect/tabrest.cpp - Format dates entered as integer when formatted modified: storage/connect/value.cpp modified: storage/connect/value.h
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/************** tabrest C++ Program Source Code File (.CPP) ************/
|
||||
/* PROGRAM NAME: tabrest Version 2.0 */
|
||||
/* PROGRAM NAME: tabrest Version 2.1 */
|
||||
/* (C) Copyright to the author Olivier BERTRAND 2018 - 2021 */
|
||||
/* This program is the REST Web API support for MariaDB. */
|
||||
/* The way Connect handles NOSQL data returned by REST queries is */
|
||||
@@ -37,7 +37,7 @@
|
||||
#include "tabrest.h"
|
||||
|
||||
#if defined(connect_EXPORTS)
|
||||
#define PUSH_WARNING(M) push_warning(current_thd, Sql_condition::WARN_LEVEL_WARN, 0, M)
|
||||
#define PUSH_WARNING(M) push_warning(current_thd, Sql_condition::WARN_LEVEL_NOTE, 0, M)
|
||||
#else
|
||||
#define PUSH_WARNING(M) htrc(M)
|
||||
#endif
|
||||
@@ -60,12 +60,12 @@ int Xcurl(PGLOBAL g, PCSZ Http, PCSZ Uri, PCSZ filename)
|
||||
|
||||
if (Uri) {
|
||||
if (*Uri == '/' || Http[strlen(Http) - 1] == '/')
|
||||
sprintf(buf, "%s%s", Http, Uri);
|
||||
my_snprintf(buf, sizeof(buf)-1, "%s%s", Http, Uri);
|
||||
else
|
||||
sprintf(buf, "%s/%s", Http, Uri);
|
||||
my_snprintf(buf, sizeof(buf)-1, "%s/%s", Http, Uri);
|
||||
|
||||
} else
|
||||
strcpy(buf, Http);
|
||||
my_snprintf(buf, sizeof(buf)-1, "%s", Http);
|
||||
|
||||
#if defined(_WIN32)
|
||||
char cmd[1024];
|
||||
|
Reference in New Issue
Block a user