diff options
| author | unknown <aivanov@mysql.com> | 2006-04-26 08:30:37 +0400 |
|---|---|---|
| committer | unknown <aivanov@mysql.com> | 2006-04-26 08:30:37 +0400 |
| commit | 67d23360d791b86a0f82fef56b80c7884ea0dede (patch) | |
| tree | f6f9823c53befea7e0c9ba768102a4be32689bf3 /storage/innobase/os/os0thread.c | |
| parent | f13569a76b996816657e4526898b59c42d545a2c (diff) | |
| download | mariadb-git-67d23360d791b86a0f82fef56b80c7884ea0dede.tar.gz | |
Applied innodb-5.1-ss492 snapshot.
* Fix BUG#19217 "dict_load_indexes() may read the delete-mark incorrectly".
* Remove obsolete and unused variables from srv0srv.c.
* Remove srv_sys->operational since it is unused.
* Make thread_id parameter in os_thread_create() optional.
* Add platform-specific os_thread_ret_t and OS_THREAD_DUMMY_RETURN,
and convert thread start functions to use them.
storage/innobase/dict/dict0dict.c:
Applied innodb-5.1-ss492 snapshot.
storage/innobase/dict/dict0load.c:
Applied innodb-5.1-ss492 snapshot.
dict_load_indexes(): pass comp=0 to rec_get_deleted_flag(), because
SYS_INDEXES always is in ROW_FORMAT=REDUNDANT (Bug #19217).
storage/innobase/include/os0thread.h:
Applied innodb-5.1-ss492 snapshot.
storage/innobase/include/srv0srv.h:
Applied innodb-5.1-ss492 snapshot.
storage/innobase/include/trx0roll.h:
Applied innodb-5.1-ss492 snapshot.
storage/innobase/include/univ.i:
Applied innodb-5.1-ss492 snapshot.
storage/innobase/log/log0recv.c:
Applied innodb-5.1-ss492 snapshot.
storage/innobase/os/os0thread.c:
Applied innodb-5.1-ss492 snapshot.
storage/innobase/que/que0que.c:
Applied innodb-5.1-ss492 snapshot.
storage/innobase/srv/srv0srv.c:
Applied innodb-5.1-ss492 snapshot.
storage/innobase/srv/srv0start.c:
Applied innodb-5.1-ss492 snapshot.
storage/innobase/trx/trx0roll.c:
Applied innodb-5.1-ss492 snapshot.
Diffstat (limited to 'storage/innobase/os/os0thread.c')
| -rw-r--r-- | storage/innobase/os/os0thread.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/storage/innobase/os/os0thread.c b/storage/innobase/os/os0thread.c index ff0362840c7..0b739c07557 100644 --- a/storage/innobase/os/os0thread.c +++ b/storage/innobase/os/os0thread.c @@ -96,7 +96,7 @@ os_thread_create( void* arg, /* in: argument to start function */ os_thread_id_t* thread_id) /* out: id of the created - thread */ + thread, or NULL */ { #ifdef __WIN__ os_thread_t thread; @@ -122,7 +122,9 @@ os_thread_create( ut_a(SetThreadPriority(thread, srv_query_thread_priority)); } - *thread_id = win_thread_id; + if (thread_id) { + *thread_id = win_thread_id; + } return(thread); #else @@ -180,7 +182,9 @@ os_thread_create( my_pthread_setprio(pthread, srv_query_thread_priority); } - *thread_id = pthread; + if (thread_id) { + *thread_id = pthread; + } return(pthread); #endif |