mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

-- Check whether USERBLK still exists in PlugExit

Browse source 
modified:   storage/connect/connect.cc
  modified:   storage/connect/plugutil.cpp
  modified:   storage/connect/jsonudf.cpp

-- Update result from json_udf test
  modified:   storage/connect/mysql-test/connect/r/json_udf.result
This commit is contained in:
Olivier Bertrand 2017-07-19 00:16:58 +02:00
parent 38c9c0d22b
commit e05920f783
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
storage/connect/connect.cc
View file

@ -66,8 +66,10 @@ PGLOBAL CntExit(PGLOBAL g)
if (g) {
CntEndDB(g);
if (g->Activityp)
delete g->Activityp;
if (g->Activityp) {
delete g->Activityp;
g->Activityp = NULL;
} // endif Activityp
PlugExit(g);
g= NULL;

2
storage/connect/mysql-test/connect/r/json_udf.result
View file

@ -608,7 +608,7 @@ JsonGet_String(Json_File('test/fx.json'), '1.*')
{"_id":6,"type":"car","item":"roadster","mileage":56000,"ratings":[6,9]}
SELECT JsonGet_String(Json_File('test/fx.json'), '1');
JsonGet_String(Json_File('test/fx.json'), '1')
6 car roadster 56000 <null>
6 car roadster 56000 6 9
SELECT JsonGet_Int(Json_File('test/fx.json'), '1.mileage') AS Mileage;
Mileage
56000