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/include/univ.i | |
| 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/include/univ.i')
| -rw-r--r-- | storage/innobase/include/univ.i | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index 5b294ae0769..c5e87e468c6 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -273,6 +273,18 @@ it is read or written. */ /* Compile-time constant of the given array's size. */ #define UT_ARR_SIZE(a) (sizeof(a) / sizeof((a)[0])) +/* The return type from a thread's start function differs between Unix and +Windows, so define a typedef for it and a macro to use at the end of such +functions. */ + +#ifdef __WIN__ +typedef ulint os_thread_ret_t; +#define OS_THREAD_DUMMY_RETURN return(0) +#else +typedef void* os_thread_ret_t; +#define OS_THREAD_DUMMY_RETURN return(NULL) +#endif + #include <stdio.h> #include "ut0dbg.h" #include "ut0ut.h" |