mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 03:47:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge

Browse source 
include/my_sys.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
innobase/btr/btr0cur.c:
  Use local file
scripts/make_binary_distribution.sh:
  Add mysql_waitpid
sql/mysqld.cc:
  Simple cleanup
This commit is contained in:
unknown 2003-01-28 09:02:51 +02:00
commit c97ddd06f4
121 changed files with 7095 additions and 64276 deletions
Download patch file Download diff file Expand all files Collapse all files

14
myisam/mi_test3.c
View file

@ -16,6 +16,8 @@
/* Test av locking */
#ifndef __NETWARE__
#include "myisam.h"
#include <sys/types.h>
#ifdef HAVE_SYS_WAIT_H
@ -483,3 +485,15 @@ int test_update(MI_INFO *file,int id,int lock_type)
printf("%2d: update: %5d\n",id,update); fflush(stdout);
return 0;
}
#else /* __NETWARE__ */
#include <stdio.h>
main()
{
fprintf(stderr,"this test has not been ported to NetWare\n");
return 0;
}
#endif /* __NETWARE__ */