database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

- Add new Json UDF's Json_Array_Add, Json_Array_Grp and Json_Object_Grp.

Browse Source 
Handle longjmp's raised during json processing.
modified:
  storage/connect/global.h
  storage/connect/ha_connect.cc
  storage/connect/json.cpp
  storage/connect/jsonudf.cpp

- Fix wrong references to the suppressed g->Trace variables.
modified:
  storage/connect/global.h
  storage/connect/plugutil.c
  storage/connect/tabjson.cpp
  storage/connect/tabodbc.cpp
This commit is contained in:
Olivier Bertrand
2015-02-22 17:53:02 +01:00
parent d9175f3822
commit a736e63f7c
8 changed files with 131 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
storage/connect/tabodbc.cpp
View File

@@ -787,7 +787,7 @@ bool TDBODBC::OpenDB(PGLOBAL g)
{
bool rc = true;
if (g->Trace)
if (trace)
htrc("ODBC OpenDB: tdbp=%p tdb=R%d use=%dmode=%d\n",
this, Tdb_No, Use, Mode);
@@ -1185,12 +1185,12 @@ void ODBCCOL::ReadColumn(PGLOBAL g)
} // endif Buf_Type
if (g->Trace) {
if (trace) {
char buf[64];
htrc("ODBC Column %s: rows=%d buf=%p type=%d value=%s\n",
Name, tdbp->Rows, Bufp, Buf_Type, Value->GetCharString(buf));
} // endif Trace
} // endif trace
put:
if (tdbp->Memory != 2)
@@ -1424,7 +1424,7 @@ bool TDBXDBC::OpenDB(PGLOBAL g)
{
bool rc = false;
if (g->Trace)
if (trace)
htrc("ODBC OpenDB: tdbp=%p tdb=R%d use=%dmode=%d\n",
this, Tdb_No, Use, Mode);