1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

automatic merge

Browse Source
This commit is contained in:
Michael Widenius 2012-04-02 12:27:15 +03:00
commit ca28d5fcf8
7 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd-line-utils/libedit/chartype.h
View File

@ -49,7 +49,7 @@
TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */ TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
#if !defined(__NetBSD__) && !defined(__sun) \ #if !defined(__NetBSD__) && !defined(__sun) \
&& !(defined(__APPLE__) && defined(__MACH__)) \ && !(defined(__APPLE__) && defined(__MACH__)) \
&& !defined(__FreeBSD__) && !defined(_AIX) && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__OpenBSD__)
#ifndef __STDC_ISO_10646__ #ifndef __STDC_ISO_10646__
/* In many places it is assumed that the first 127 code points are ASCII /* In many places it is assumed that the first 127 code points are ASCII
* compatible, so ensure wchar_t indeed does ISO 10646 and not some other * compatible, so ensure wchar_t indeed does ISO 10646 and not some other

2
cmd-line-utils/libedit/np/unvis.c
View File

@ -64,7 +64,7 @@ static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/4/93";
#include "np/vis.h" #include "np/vis.h"
#ifdef __weak_alias #ifdef __weak_alias
__weak_alias(strnunvisx,_strnunvisx) __weak_alias(strnunvisx,_strnunvisx);
#endif #endif
#if !HAVE_VIS #if !HAVE_VIS

2
cmd-line-utils/libedit/np/vis.c
View File

@ -77,7 +77,7 @@
#include <stdlib.h> #include <stdlib.h>
#ifdef __weak_alias #ifdef __weak_alias
__weak_alias(strvisx,_strvisx) __weak_alias(strvisx,_strvisx);
#endif #endif
#if !HAVE_VIS || !HAVE_SVIS #if !HAVE_VIS || !HAVE_SVIS

2
mysys/my_getsystime.c
View File

@ -124,7 +124,7 @@ void my_time_init()
ulonglong my_getcputime() ulonglong my_getcputime()
{ {
#ifdef HAVE_CLOCK_GETTIME #ifdef CLOCK_THREAD_CPUTIME_ID
struct timespec tp; struct timespec tp;
if (clock_gettime(CLOCK_THREAD_CPUTIME_ID, &tp)) if (clock_gettime(CLOCK_THREAD_CPUTIME_ID, &tp))
return 0; return 0;

1
plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp
View File

@ -7,6 +7,7 @@
*/ */
#include <my_config.h> #include <my_config.h>
#include <sys/types.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <errno.h> #include <errno.h>
#include <poll.h> #include <poll.h>

2
sql/mysqld.cc
View File

@ -2678,6 +2678,7 @@ static void init_signals(void)
my_sigset(THR_SERVER_ALARM,print_signal_warning); // Should never be called! my_sigset(THR_SERVER_ALARM,print_signal_warning); // Should never be called!
#ifdef HAVE_STACKTRACE
if (opt_stack_trace || (test_flags & TEST_CORE_ON_SIGNAL)) if (opt_stack_trace || (test_flags & TEST_CORE_ON_SIGNAL))
{ {
sa.sa_flags = SA_RESETHAND | SA_NODEFER; sa.sa_flags = SA_RESETHAND | SA_NODEFER;
@ -2700,6 +2701,7 @@ static void init_signals(void)
sigaction(SIGILL, &sa, NULL); sigaction(SIGILL, &sa, NULL);
sigaction(SIGFPE, &sa, NULL); sigaction(SIGFPE, &sa, NULL);
} }
#endif
#ifdef HAVE_GETRLIMIT #ifdef HAVE_GETRLIMIT
if (test_flags & TEST_CORE_ON_SIGNAL) if (test_flags & TEST_CORE_ON_SIGNAL)

6
sql/sql_plugin.cc
View File

@ -2203,7 +2203,7 @@ static int check_func_bool(THD *thd, struct st_mysql_sys_var *var,
{ {
if (value->val_int(value, &tmp) < 0) if (value->val_int(value, &tmp) < 0)
goto err; goto err;
if (tmp > 1) if (tmp != 0 && tmp != 1)
{ {
llstr(tmp, buff); llstr(tmp, buff);
strvalue= buff; strvalue= buff;
@ -2211,7 +2211,7 @@ static int check_func_bool(THD *thd, struct st_mysql_sys_var *var,
} }
result= (int) tmp; result= (int) tmp;
} }
*(my_bool *) save= -result; *(my_bool *) save= result ? 1 : 0;
return 0; return 0;
err: err:
my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), var->name, strvalue); my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), var->name, strvalue);
@ -2392,7 +2392,7 @@ err:
static void update_func_bool(THD *thd, struct st_mysql_sys_var *var, static void update_func_bool(THD *thd, struct st_mysql_sys_var *var,
void *tgt, const void *save) void *tgt, const void *save)
{ {
*(my_bool *) tgt= *(my_bool *) save ? TRUE : FALSE; *(my_bool *) tgt= *(my_bool *) save ? 1 : 0;
} }