mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 11:57:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

Commit win and CONNECT resolved files

Browse source
This commit is contained in:
Olivier Bertrand 2015-06-05 23:54:19 +02:00
commit 1c756512b0
2211 changed files with 159086 additions and 66646 deletions
Download patch file Download diff file Expand all files Collapse all files

3
storage/connect/json.h
View file

@ -267,4 +267,7 @@ class JVALUE : public JSON {
PJVAL Next; // Next value in array
bool Del; // True when deleted
}; // end of class JVALUE
<<<<<<< HEAD
=======
>>>>>>> ob-10.1