diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-08-24 19:30:32 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-08-24 19:30:32 -0400 |
| commit | c309e99ff9b48c1736ff468e72153048c4b56561 (patch) | |
| tree | 1fb9e8831597007bcfa9e7ea2b2aadb717b962cd /include | |
| parent | 8b09db8bfb81f1e7695cfcfa6ce2bec45247171f (diff) | |
| parent | 5bbe929d706e26cb3f9b291da6009526a17b1545 (diff) | |
| download | mariadb-git-c309e99ff9b48c1736ff468e72153048c4b56561.tar.gz | |
Merge branch '10.0' into 10.0-galera
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_stacktrace.h | 2 | ||||
| -rw-r--r-- | include/mysql.h.pp | 2 | ||||
| -rw-r--r-- | include/mysql_com.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/my_stacktrace.h b/include/my_stacktrace.h index fb2525e3a12..fad6e532de9 100644 --- a/include/my_stacktrace.h +++ b/include/my_stacktrace.h @@ -45,7 +45,7 @@ C_MODE_START #if defined(HAVE_STACKTRACE) || defined(HAVE_BACKTRACE) void my_init_stacktrace(); void my_print_stacktrace(uchar* stack_bottom, ulong thread_stack); -void my_safe_print_str(const char* val, int max_len); +int my_safe_print_str(const char* val, int max_len); void my_write_core(int sig); #if BACKTRACE_DEMANGLE char *my_demangle(const char *mangled_name, int *status); diff --git a/include/mysql.h.pp b/include/mysql.h.pp index 2c8e47b454f..a593f526c6e 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -27,7 +27,7 @@ typedef struct st_net { char save_char; char net_skip_rest_factor; my_bool thread_specific_malloc; - my_bool compress; + unsigned char compress; my_bool unused3; unsigned char *unused; unsigned int last_errno; diff --git a/include/mysql_com.h b/include/mysql_com.h index 8fdac38dd66..96514a28310 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -386,7 +386,7 @@ typedef struct st_net { char save_char; char net_skip_rest_factor; my_bool thread_specific_malloc; - my_bool compress; + unsigned char compress; my_bool unused3; /* Please remove with the next incompatible ABI change. */ /* Pointer to query object in query cache, do not equal NULL (0) for |