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

Merged in some patches from Novell.

Browse source 
netware/BUILD/nwbootstrap:
  Patch from Novell, create the libmysqld.imp file.
netware/mysqld_safe.c:
  Patch from Novell, new option --set-variable.
This commit is contained in:
unknown 2004-05-27 23:39:50 +03:00
commit d5d9f91575
2 changed files with 74 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

5
netware/BUILD/nwbootstrap
View file

@ -171,6 +171,11 @@ do
rm $file.org
done
# create the libmysql.imp file in netware folder from libmysql/libmysql.def
# file
echo "generating llibmysql.imp file..."
awk 'BEGIN{x=0;} x==1 {print $1;next} /EXPORTS/{x=1}' libmysql/libmysql.def > netware/libmysql.imp
# build linux tools
echo "compiling linux tools..."
./netware/BUILD/compile-linux-tools

36
netware/mysqld_safe.c
View file

@ -67,6 +67,7 @@ void check_data_vol();
void check_setup();
void check_tables();
void mysql_start(int, char*[]);
void parse_setvar(char *arg);
/******************************************************************************
@ -321,7 +322,8 @@ void parse_args(int argc, char *argv[])
OPT_ERR_LOG,
OPT_SAFE_LOG,
OPT_MYSQLD,
OPT_HELP
OPT_HELP,
OPT_SETVAR
};
static struct option options[] =
@ -337,6 +339,7 @@ void parse_args(int argc, char *argv[])
{"safe-log", required_argument, 0, OPT_SAFE_LOG},
{"mysqld", required_argument, 0, OPT_MYSQLD},
{"help", no_argument, 0, OPT_HELP},
{"set-variable", required_argument, 0, OPT_SETVAR},
{0, 0, 0, 0}
};
@ -385,6 +388,10 @@ void parse_args(int argc, char *argv[])
strcpy(mysqld, optarg);
break;
case OPT_SETVAR:
parse_setvar(optarg);
break;
case OPT_HELP:
usage();
break;
@ -396,6 +403,25 @@ void parse_args(int argc, char *argv[])
}
}
/*
parse_setvar(char *arg)
Pasrsing for port just to display the port num on the mysqld_safe screen
*/
void parse_setvar(char *arg)
{
char *pos;
if ((pos= strindex(arg, "port")))
{
for (; *pos && *pos != '='; pos++) ;
if (*pos)
strcpy(port, pos + 1);
}
}
/******************************************************************************
/******************************************************************************
get_options()
@ -633,13 +659,17 @@ void mysql_start(int argc, char *argv[])
if(!strnicmp(argv[i], private_options[j], strlen(private_options[j])))
{
skip = TRUE;
consoleprintf("The argument skipped is %s\n",argv[i]);
break;
}
}
if (!skip) add_arg(&al, "%s", argv[i]);
if (!skip)
{
add_arg(&al, "%s", argv[i]);
consoleprintf("The final argument is %s\n",argv[i]);
}
}
// spawn
do
{