database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

4.1->5.0 merge

Browse Source 
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
This commit is contained in:
unknown
2005-10-29 02:36:57 +04:00
parent ed9a29f157 d5bb660640
commit 2f6bb04f9e
6 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/config-netware.h
View File

@ -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)