diff options
| author | unknown <sergefp@mysql.com> | 2005-10-29 02:36:57 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-10-29 02:36:57 +0400 |
| commit | 2f6bb04f9e952970528f43124942e3b533e7969a (patch) | |
| tree | 45ae3ddd001a6f4023a0be5975954ff46ec00ea3 /include/config-netware.h | |
| parent | ed9a29f1573a6ad9c0b8a934b957cf43ea7d5ffd (diff) | |
| parent | d5bb660640c9cb968469f38e2fa5a971782cf254 (diff) | |
| download | mariadb-git-2f6bb04f9e952970528f43124942e3b533e7969a.tar.gz | |
4.1->5.0 merge
include/config-netware.h:
Merged
innobase/row/row0ins.c:
BUG#10511: Per alexi's instructions, the changes in innobase/row/row0ins.c are not
propagated to 5.x
mysql-test/r/create.result:
Auto Merged
mysql-test/t/create.test:
Auto Merged
sql/field.cc:
Auto Merged
sql/field.h:
Manual Merge
sql/sql_table.cc:
Auto Merged
Diffstat (limited to 'include/config-netware.h')
| -rw-r--r-- | include/config-netware.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/config-netware.h b/include/config-netware.h index 4c46ccd3ec7..7def0053bf2 100644 --- a/include/config-netware.h +++ b/include/config-netware.h @@ -118,15 +118,12 @@ extern "C" { /* do not use the extended time in LibC sys\stat.h */ #define _POSIX_SOURCE -/* Kernel call on NetWare that will only yield if our time slice is up */ -void kYieldIfTimeSliceUp(void); - /* Some macros for portability */ #define set_timespec(ABSTIME,SEC) { (ABSTIME).tv_sec=time(NULL)+(SEC); (ABSTIME).tv_nsec=0; } /* extra protection against CPU Hogs on NetWare */ -#define NETWARE_YIELD kYieldIfTimeSliceUp() +#define NETWARE_YIELD pthread_yield() /* Screen mode for help texts */ #define NETWARE_SET_SCREEN_MODE(A) setscreenmode(A) |