diff options
| author | unknown <istruewing@chilla.local> | 2007-03-30 09:14:11 +0200 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-03-30 09:14:11 +0200 |
| commit | a2139d0254dbcc684b2ea52f720bdc8631a4240d (patch) | |
| tree | 26f3c2af8790bfe547801faa0ceeecb08b7be346 | |
| parent | 1d3d4d0d012d1e97df74c117ec6c0a3aa4c9533a (diff) | |
| download | mariadb-git-a2139d0254dbcc684b2ea52f720bdc8631a4240d.tar.gz | |
Post merge fix
| -rw-r--r-- | mysys/my_pthread.c | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index db01602f4ab..d8182b67442 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -29,8 +29,6 @@ #define SCHED_POLICY SCHED_OTHER #endif -uint thd_lib_detected= 0; - uint thd_lib_detected; #ifndef my_pthread_setprio diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 56bb9423f1a..51feb197713 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -599,9 +599,6 @@ pthread_mutex_t LOCK_server_started; pthread_cond_t COND_server_started; int mysqld_server_started= 0; -#ifndef EMBEDDED_LIBRARY -static uint thr_kill_signal; -#endif File_parser_dummy_hook file_parser_dummy_hook; |