Commit 608ad38a authored by Olivier Bertrand's avatar Olivier Bertrand

Temporary changes for making compile to work

parent a575d90f
...@@ -31,7 +31,9 @@ extern "C" { ...@@ -31,7 +31,9 @@ extern "C" {
#ifndef MYSQL_ABI_CHECK #ifndef MYSQL_ABI_CHECK
#ifdef _WIN32 #ifdef _WIN32
#include <malloc.h> #include <malloc.h>
#ifndef __cplusplus
#define inline __inline #define inline __inline
#endif
#else #else
#include <alloca.h> #include <alloca.h>
#endif #endif
......
...@@ -2630,6 +2630,7 @@ public: ...@@ -2630,6 +2630,7 @@ public:
ulong query_plan_fsort_passes; ulong query_plan_fsort_passes;
pthread_t real_id; /* For debugging */ pthread_t real_id; /* For debugging */
my_thread_id thread_id; my_thread_id thread_id;
typedef ulong pid_t;
pid_t os_thread_id; pid_t os_thread_id;
uint tmp_table, global_disable_checkpoint; uint tmp_table, global_disable_checkpoint;
uint server_status,open_options; uint server_status,open_options;
......
...@@ -85,14 +85,14 @@ extern "C" { ...@@ -85,14 +85,14 @@ extern "C" {
DllExport void json_object_grp_clear(UDF_INIT *, char *, char *); DllExport void json_object_grp_clear(UDF_INIT *, char *, char *);
DllExport void json_object_grp_deinit(UDF_INIT*); DllExport void json_object_grp_deinit(UDF_INIT*);
DllExport my_bool json_get_item_init(UDF_INIT*, UDF_ARGS*, char*);
DllExport char *json_get_item(UDF_EXEC_ARGS);
DllExport void json_get_item_deinit(UDF_INIT*);
DllExport my_bool json_item_merge_init(UDF_INIT*, UDF_ARGS*, char*); DllExport my_bool json_item_merge_init(UDF_INIT*, UDF_ARGS*, char*);
DllExport char *json_item_merge(UDF_EXEC_ARGS); DllExport char *json_item_merge(UDF_EXEC_ARGS);
DllExport void json_item_merge_deinit(UDF_INIT*); DllExport void json_item_merge_deinit(UDF_INIT*);
DllExport my_bool json_get_item_init(UDF_INIT*, UDF_ARGS*, char*);
DllExport char *json_get_item(UDF_EXEC_ARGS);
DllExport void json_get_item_deinit(UDF_INIT*);
DllExport my_bool jsonget_string_init(UDF_INIT*, UDF_ARGS*, char*); DllExport my_bool jsonget_string_init(UDF_INIT*, UDF_ARGS*, char*);
DllExport char *jsonget_string(UDF_EXEC_ARGS); DllExport char *jsonget_string(UDF_EXEC_ARGS);
DllExport void jsonget_string_deinit(UDF_INIT*); DllExport void jsonget_string_deinit(UDF_INIT*);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment