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

Merge 10.2 into bb-10.2-ext

Browse Source
This commit is contained in:
Marko Mäkelä
2017-09-20 17:47:49 +03:00
parent 4cfef2a5a4 96f06f952d
commit fc3b1a7d2f
230 changed files with 3599 additions and 2155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/connect/jsonudf.cpp
View File

@@ -539,7 +539,7 @@ PVAL JSNX::CalculateArray(PGLOBAL g, PJAR arp, int n)
SetJsonValue(g, MulVal, jvp, n);
if (!MulVal->IsNull()) {
switch (op) {
switch (op) {
case OP_CNC:
if (Nodes[n].CncVal) {
val[0] = Nodes[n].CncVal;