mirror of
https://github.com/MariaDB/server.git
synced 2025-01-15 19:42:28 +01:00
300b3fb642
Novell patches Makefile.am: Novell patch client/mysql.cc: Novell patch configure.in: Novell patch extra/mysql_waitpid.c: Novell patch include/my_pthread.h: Novell patch include/mysql.h: Novell patch libmysql/libmysql.c: Novell patch libmysqld/libmysqld.c: Novell patch mysql-test/mysql-test-run.sh: Don't use running server with --valgrind mysql-test/r/innodb.result: Updated results mysql-test/r/rpl000001.result: Updated results mysql-test/r/rpl000004.result: Updated results mysql-test/r/rpl_log.result: Updated results mysql-test/r/type_blob.result: Updated results mysql-test/std_data/words.dat: Added more words to make type_blob test relevant mysql-test/t/innodb.test: test of multi-table-delete mysql-test/t/rpl000001.test: Update for new word file mysql-test/t/type_blob.test: Test if BLOB IS NULL on NOT NULL column mysys/my_init.c: Novell patch mysys/my_netware.c: Novell patch netware/Makefile.am: Novell patch netware/init_db.sql: Novell patch netware/isamchk.def: Novell patch netware/isamlog.def: Novell patch netware/libmysql.def: Novell patch netware/my_print_defaults.def: Novell patch netware/myisamchk.def: Novell patch netware/myisamlog.def: Novell patch netware/myisampack.def: Novell patch netware/mysql.def: Novell patch netware/mysql_install_db.c: Novell patch netware/mysql_install_db.def: Novell patch netware/mysql_test_run.def: Novell patch netware/mysqladmin.def: Novell patch netware/mysqlbinlog.def: Novell patch netware/mysqlcheck.def: Novell patch netware/mysqld_safe.c: Novell patch netware/mysqldump.def: Novell patch netware/mysqlimport.def: Novell patch netware/mysqlshow.def: Novell patch netware/mysqltest.def: Novell patch netware/pack_isam.def: Novell patch netware/perror.def: Novell patch netware/replace.def: Novell patch netware/resolveip.def: Novell patch netware/test_db.sql: Novell patch scripts/make_binary_distribution.sh: Novell patch sql/item_cmpfunc.h: Optimization of 'IS NULL' sql/mysql_priv.h: Code cleanup sql/mysqld.cc: Novell patch sql/net_pkg.cc: Code cleanup sql/records.cc: Fixed multi-table-delete for InnoDB tables sql/sql_delete.cc: Fixed multi-table-delete for InnoDB tables sql/sql_handler.cc: Code cleanup sql/sql_table.cc: Code cleanup sql/structs.h: Fixed multi-table-delete for InnoDB tables
117 lines
3.1 KiB
C
117 lines
3.1 KiB
C
/* Copyright (C) 2003 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/* Wait until a program dies */
|
|
|
|
#ifndef __NETWARE__
|
|
|
|
#include <my_global.h>
|
|
#include <m_string.h>
|
|
#include <my_getopt.h>
|
|
#include <signal.h>
|
|
#include <errno.h>
|
|
|
|
static const char *VER= "1.1";
|
|
static char *progname;
|
|
static my_bool verbose;
|
|
|
|
void usage(void);
|
|
|
|
static struct my_option my_long_options[] =
|
|
{
|
|
{"help", '?', "Display this help and exit.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0,
|
|
0, 0, 0, 0, 0},
|
|
{"help", 'I', "Synonym for -?.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0,
|
|
0, 0, 0, 0, 0},
|
|
{"verbose", 'v',
|
|
"Be more verbose. Give a warning, if kill can't handle signal 0.",
|
|
(gptr*) &verbose, (gptr*) &verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"version", 'V', "Print version information and exit.", 0, 0, 0,
|
|
GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
|
|
};
|
|
|
|
static my_bool
|
|
get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|
char *argument __attribute__((unused)))
|
|
{
|
|
switch(optid) {
|
|
case 'V':
|
|
printf("%s version %s by Jani Tolonen\n", progname, VER);
|
|
exit(-1);
|
|
case 'I':
|
|
case '?':
|
|
usage();
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
int pid= 0, t= 0, sig= 0;
|
|
|
|
progname= argv[0];
|
|
|
|
if (handle_options(&argc, &argv, my_long_options, get_one_option))
|
|
exit(-1);
|
|
if (!argv[0] || !argv[1] || (pid= atoi(argv[0])) <= 0 ||
|
|
(t= atoi(argv[1])) <= 0)
|
|
usage();
|
|
for (; t > 0; t--)
|
|
{
|
|
if (kill((pid_t) pid, sig))
|
|
{
|
|
if (errno == EINVAL)
|
|
{
|
|
if (verbose)
|
|
printf("WARNING: kill couldn't handle signal 0, using signal 1.\n");
|
|
sig= 1;
|
|
t++;
|
|
continue;
|
|
}
|
|
return 0;
|
|
}
|
|
sleep(1);
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
void usage(void)
|
|
{
|
|
printf("%s version %s by Jani Tolonen\n\n", progname, VER);
|
|
printf("usage: %s [options] #pid #time\n\n", progname);
|
|
printf("Description: Waits for a program, which program id is #pid, to\n");
|
|
printf("terminate within #time seconds. If the program terminates within\n");
|
|
printf("this time, or if the #pid no longer exists, value 0 is returned.\n");
|
|
printf("Otherwise 1 is returned. Both #pid and #time must be positive\n");
|
|
printf("integer arguments.\n\n");
|
|
printf("Options:\n");
|
|
my_print_help(my_long_options);
|
|
exit(-1);
|
|
}
|
|
|
|
#else
|
|
|
|
#include <stdio.h>
|
|
|
|
main()
|
|
{
|
|
fprintf(stderr,"This tool has not been ported to NetWare\n");
|
|
return 0;
|
|
}
|
|
|
|
#endif /* __NETWARE__ */
|