diff options
| author | unknown <heikki@hundin.mysql.fi> | 2002-11-06 00:41:27 +0200 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2002-11-06 00:41:27 +0200 |
| commit | 899babbd0735f8e02c5d7f52e143fd7643b67a8c (patch) | |
| tree | fed8334ab45443418d527c3837593e1121ed1975 /innobase/os | |
| parent | 58cc500746ba3990b3b4eac980eb158b98297f42 (diff) | |
| download | mariadb-git-899babbd0735f8e02c5d7f52e143fd7643b67a8c.tar.gz | |
Many files:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
sql/ha_innodb.cc:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/dict/dict0crea.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/dict/dict0dict.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/include/log0recv.h:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/include/row0mysql.h:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/include/srv0srv.h:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/include/trx0trx.h:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/log/log0recv.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/os/os0sync.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/os/os0thread.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/row/row0ins.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/row/row0mysql.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/row/row0purge.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/row/row0undo.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/row/row0upd.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/srv/srv0srv.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/srv/srv0start.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/trx/trx0roll.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/trx/trx0trx.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
Diffstat (limited to 'innobase/os')
| -rw-r--r-- | innobase/os/os0sync.c | 10 | ||||
| -rw-r--r-- | innobase/os/os0thread.c | 13 |
2 files changed, 19 insertions, 4 deletions
diff --git a/innobase/os/os0sync.c b/innobase/os/os0sync.c index 14677ede20f..bac1f23a1af 100644 --- a/innobase/os/os0sync.c +++ b/innobase/os/os0sync.c @@ -66,8 +66,12 @@ os_event_create( event = ut_malloc(sizeof(struct os_event_struct)); os_fast_mutex_init(&(event->os_mutex)); - pthread_cond_init(&(event->cond_var), NULL); +#if defined(UNIV_HOTBACKUP) && defined(UNIV_HPUX10) + pthread_cond_init(&(event->cond_var), pthread_condattr_default); +#else + pthread_cond_init(&(event->cond_var), NULL); +#endif event->is_set = FALSE; return(event); @@ -441,8 +445,12 @@ os_fast_mutex_init( InitializeCriticalSection((LPCRITICAL_SECTION) fast_mutex); #else +#if defined(UNIV_HOTBACKUP) && defined(UNIV_HPUX10) + pthread_mutex_init(fast_mutex, pthread_mutexattr_default); +#else pthread_mutex_init(fast_mutex, MY_MUTEX_INIT_FAST); #endif +#endif } /************************************************************** diff --git a/innobase/os/os0thread.c b/innobase/os/os0thread.c index 48aea4b8abb..30404c4e66b 100644 --- a/innobase/os/os0thread.c +++ b/innobase/os/os0thread.c @@ -126,8 +126,10 @@ os_thread_create( os_thread_t pthread; pthread_attr_t attr; +#if !(defined(UNIV_HOTBACKUP) && defined(UNIV_HPUX10)) pthread_attr_init(&attr); - +#endif + #ifdef UNIV_AIX /* We must make sure a thread stack is at least 32 kB, otherwise InnoDB might crash; we do not know if the default stack size on @@ -142,16 +144,21 @@ os_thread_create( exit(1); } #endif - ret = pthread_create(&pthread, &attr, start_f, arg); +#if defined(UNIV_HOTBACKUP) && defined(UNIV_HPUX10) + ret = pthread_create(&pthread, pthread_attr_default, start_f, arg); +#else + ret = pthread_create(&pthread, &attr, start_f, arg); +#endif if (ret) { fprintf(stderr, "InnoDB: Error: pthread_create returned %d\n", ret); exit(1); } +#if !(defined(UNIV_HOTBACKUP) && defined(UNIV_HPUX10)) pthread_attr_destroy(&attr); - +#endif if (srv_set_thread_priorities) { my_pthread_setprio(pthread, srv_query_thread_priority); |