diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-06-06 19:23:06 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-06-06 19:23:06 +0200 |
| commit | 7482f073ae8677e7fcfd2bb60087bd76dfc8a8d9 (patch) | |
| tree | 355110fe62a30245363e96b9790fccd08d5a0e92 /storage/connect/json.cpp | |
| parent | 1c756512b0d67e39961ee3c54872af5041f08248 (diff) | |
| download | mariadb-git-7482f073ae8677e7fcfd2bb60087bd76dfc8a8d9.tar.gz | |
Commit od last modifications made for version 10.0
Diffstat (limited to 'storage/connect/json.cpp')
| -rw-r--r-- | storage/connect/json.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/storage/connect/json.cpp b/storage/connect/json.cpp index 315904f2b05..3d03bea5d00 100644 --- a/storage/connect/json.cpp +++ b/storage/connect/json.cpp @@ -23,11 +23,7 @@ #define ARGS MY_MIN(24,len-i),s+MY_MAX(i-3,0) -<<<<<<< HEAD #if defined(__WIN__) -======= -#if defined(WIN32) ->>>>>>> ob-10.1 #define EL "\r\n" #else #define EL "\n" @@ -1163,7 +1159,4 @@ bool JVALUE::IsNull(void) { return (Jsp) ? Jsp->IsNull() : (Value) ? Value->IsZero() : true; } // end of IsNull -<<<<<<< HEAD -======= ->>>>>>> ob-10.1 |