diff options
| author | monty@hundin.mysql.fi <> | 2001-09-02 16:03:37 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-09-02 16:03:37 +0300 |
| commit | 825ad1f8e7c35c994d6953a0eb99d66c5029ef1e (patch) | |
| tree | 8e23ee5c5fb05aab08ef350c98bd7bf10f84cf47 /sql | |
| parent | d42e4d27d5e9408b3cb86175b84a122ab03f9611 (diff) | |
| download | mariadb-git-825ad1f8e7c35c994d6953a0eb99d66c5029ef1e.tar.gz | |
Added testing of IN(value-list)
Portability fixes
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_func.cc | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 6 | ||||
| -rw-r--r-- | sql/stacktrace.c | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index ac12adb50e0..56e3d562ee8 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -1462,7 +1462,7 @@ longlong Item_func_get_lock::val_int() struct timespec abstime; THD *thd=current_thd; ULL *ull; - int error; + int error=0; pthread_mutex_lock(&LOCK_user_locks); diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 1255b55a81c..7d6863cb6eb 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1241,6 +1241,12 @@ information that should help you find out what is causing the crash\n"); exit(1); } +#ifndef SA_RESETHAND +#define SA_RESETHAND 0 +#endif +#ifndef SA_NODEFER +#define SA_NODEFER 0 +#endif static void init_signals(void) { diff --git a/sql/stacktrace.c b/sql/stacktrace.c index 408006dac93..81d8debc27a 100644 --- a/sql/stacktrace.c +++ b/sql/stacktrace.c @@ -17,6 +17,7 @@ #include <global.h> #include "stacktrace.h" #include <signal.h> +#include <my_pthread.h> #ifdef HAVE_STACKTRACE #include <unistd.h> |