Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
fea723f9
Commit
fea723f9
authored
Apr 17, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into zim.(none):/home/brian/mysql/dep-5.1
parents
2c1703db
98a8b415
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
2 additions
and
92 deletions
+2
-92
extra/resolveip.c
extra/resolveip.c
+1
-1
include/m_string.h
include/m_string.h
+0
-13
include/my_global.h
include/my_global.h
+0
-5
include/my_no_pthread.h
include/my_no_pthread.h
+0
-4
include/my_pthread.h
include/my_pthread.h
+0
-62
mysys/my_init.c
mysys/my_init.c
+0
-3
mysys/my_pthread.c
mysys/my_pthread.c
+1
-4
No files found.
extra/resolveip.c
View file @
fea723f9
...
...
@@ -32,7 +32,7 @@
#include <my_net.h>
#include <my_getopt.h>
#if !defined(_AIX) && !defined(
HAVE_UNIXWARE7_THREADS) && !defined(HAVE_UNIXWARE7_POSIX) && !defined(
h_errno)
#if !defined(_AIX) && !defined(h_errno)
extern
int
h_errno
;
#endif
...
...
include/m_string.h
View file @
fea723f9
...
...
@@ -34,19 +34,6 @@
/* need by my_vsnprintf */
#include <stdarg.h>
/* Correct some things for UNIXWARE7 */
#ifdef HAVE_UNIXWARE7_THREADS
#undef HAVE_STRINGS_H
#undef HAVE_MEMORY_H
#define HAVE_MEMCPY
#ifndef HAVE_MEMMOVE
#define HAVE_MEMMOVE
#endif
#undef HAVE_BCMP
#undef bcopy
#undef bcmp
#undef bzero
#endif
/* HAVE_UNIXWARE7_THREADS */
#ifdef _AIX
#undef HAVE_BCMP
#endif
...
...
include/my_global.h
View file @
fea723f9
...
...
@@ -208,7 +208,6 @@
#undef THREAD
#undef HAVE_LINUXTHREADS
#undef HAVE_NPTL
#undef HAVE_UNIXWARE7_THREADS
#endif
#ifdef HAVE_THREADS_WITHOUT_SOCKETS
...
...
@@ -264,9 +263,6 @@
#if !defined(_THREAD_SAFE) && !defined(_AIX)
#define _THREAD_SAFE
/* Required for OSF1 */
#endif
#ifdef HAVE_UNIXWARE7_THREADS
#include <thread.h>
#else
#if defined(HPUX10) || defined(HPUX11)
C_MODE_START
/* HPUX needs this, signal.h bug */
#include <pthread.h>
...
...
@@ -274,7 +270,6 @@ C_MODE_END
#else
#include <pthread.h>
/* AIX must have this included first */
#endif
#endif
/* HAVE_UNIXWARE7_THREADS */
#if !defined(SCO) && !defined(_REENTRANT)
#define _REENTRANT 1
/* Threads requires reentrant code */
#endif
...
...
include/my_no_pthread.h
View file @
fea723f9
...
...
@@ -27,10 +27,6 @@
Case in point: 'mf_keycache.c'
*/
#if defined(__WIN__)
#elif defined(HAVE_UNIXWARE7_THREADS)
/* #include <thread.h> Currently, not relevant. Enable if needed. */
#else
/* Normal threads */
#include <pthread.h>
...
...
include/my_pthread.h
View file @
fea723f9
...
...
@@ -142,68 +142,6 @@ void pthread_exit(void *a); /* was #define pthread_exit(A) ExitThread(A)*/
/*#define my_pthread_getprio(pthread_t thread_id) pthread_dummy(0) */
#define my_pthread_getprio(thread_id) pthread_dummy(0)
#elif defined(HAVE_UNIXWARE7_THREADS)
#include <thread.h>
#include <synch.h>
#ifndef _REENTRANT
#define _REENTRANT
#endif
#define HAVE_NONPOSIX_SIGWAIT
#define pthread_t thread_t
#define pthread_cond_t cond_t
#define pthread_mutex_t mutex_t
#define pthread_key_t thread_key_t
typedef
int
pthread_attr_t
;
/* Needed by Unixware 7.0.0 */
#define pthread_key_create(A,B) thr_keycreate((A),(B))
#define pthread_key_delete(A) thr_keydelete(A)
#define pthread_handler_t EXTERNC void *
#define pthread_key(T,V) pthread_key_t V
void
*
my_pthread_getspecific_imp
(
pthread_key_t
key
);
#define my_pthread_getspecific(A,B) ((A) my_pthread_getspecific_imp(B))
#define my_pthread_getspecific_ptr(T,V) my_pthread_getspecific(T,V)
#define pthread_setspecific(A,B) thr_setspecific(A,B)
#define my_pthread_setspecific_ptr(T,V) pthread_setspecific(T,V)
#define pthread_create(A,B,C,D) thr_create(NULL,65536L,(C),(D),THR_DETACHED,(A))
#define pthread_cond_init(a,b) cond_init((a),USYNC_THREAD,NULL)
#define pthread_cond_destroy(a) cond_destroy(a)
#define pthread_cond_signal(a) cond_signal(a)
#define pthread_cond_wait(a,b) cond_wait((a),(b))
#define pthread_cond_timedwait(a,b,c) cond_timedwait((a),(b),(c))
#define pthread_cond_broadcast(a) cond_broadcast(a)
#define pthread_mutex_init(a,b) mutex_init((a),USYNC_THREAD,NULL)
#define pthread_mutex_lock(a) mutex_lock(a)
#define pthread_mutex_unlock(a) mutex_unlock(a)
#define pthread_mutex_destroy(a) mutex_destroy(a)
#define pthread_self() thr_self()
#define pthread_exit(A) thr_exit(A)
#define pthread_equal(A,B) (((A) == (B)) ? 1 : 0)
#define pthread_kill(A,B) thr_kill((A),(B))
#define HAVE_PTHREAD_KILL
#define pthread_sigmask(A,B,C) thr_sigsetmask((A),(B),(C))
extern
int
my_sigwait
(
const
sigset_t
*
set
,
int
*
sig
);
#define pthread_detach_this_thread() pthread_dummy(0)
#define pthread_attr_init(A) pthread_dummy(0)
#define pthread_attr_destroy(A) pthread_dummy(0)
#define pthread_attr_setscope(A,B) pthread_dummy(0)
#define pthread_attr_setdetachstate(A,B) pthread_dummy(0)
#define my_pthread_setprio(A,B) pthread_dummy (0)
#define my_pthread_getprio(A) pthread_dummy (0)
#define my_pthread_attr_setprio(A,B) pthread_dummy(0)
#else
/* Normal threads */
#ifdef HAVE_rts_threads
...
...
mysys/my_init.c
View file @
fea723f9
...
...
@@ -91,9 +91,6 @@ my_bool my_init(void)
sigfillset
(
&
my_signals
);
/* signals blocked by mf_brkhant */
#endif
#endif
/* THREAD */
#ifdef UNIXWARE_7
(
void
)
isatty
(
0
);
/* Go around connect() bug in UW7 */
#endif
{
DBUG_ENTER
(
"my_init"
);
DBUG_PROCESS
((
char
*
)
(
my_progname
?
my_progname
:
"unknown"
));
...
...
mysys/my_pthread.c
View file @
fea723f9
...
...
@@ -76,9 +76,6 @@ void my_pthread_attr_setprio(pthread_attr_t *attr, int priority)
#ifdef HAVE_NONPOSIX_PTHREAD_GETSPECIFIC
#undef pthread_getspecific
#ifdef HAVE_UNIXWARE7_THREADS
#define pthread_getspecific thr_getspecific
#endif
void
*
my_pthread_getspecific_imp
(
pthread_key_t
key
)
{
...
...
@@ -429,7 +426,7 @@ int sigwait(sigset_t *setp, int *sigp)
** Patches for AIX and DEC OSF/1 3.2
*****************************************************************************/
#if
(defined(HAVE_NONPOSIX_PTHREAD_MUTEX_INIT) && !defined(HAVE_UNIXWARE7_THREADS)) || defined(HAVE_DEC_3_2_THREADS
)
#if
defined(HAVE_NONPOSIX_PTHREAD_MUTEX_INIT
)
#include <netdb.h>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment