1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge from bugteam trunk.

Browse Source
This commit is contained in:
Chad MILLER 2008-08-18 12:03:44 -04:00
commit 675610ff8d
4 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
netware/BUILD/compile-linux-tools
View File

@ -53,6 +53,9 @@ make
# so the file will be linked # so the file will be linked
(cd sql; make sql_yacc.cc) (cd sql; make sql_yacc.cc)
# we need initilizing SQL files.
(cd netware; make test_db.sql init_db.sql)
# copying required linux tools # copying required linux tools
cp extra/comp_err extra/comp_err.linux cp extra/comp_err extra/comp_err.linux
cp libmysql/conf_to_src libmysql/conf_to_src.linux cp libmysql/conf_to_src libmysql/conf_to_src.linux

8
netware/BUILD/nwbootstrap
View File

@ -91,8 +91,8 @@ done
echo "starting build..." echo "starting build..."
# check for bk and repo_dir # check for bk and repo_dir
bk help > /dev/null bzr help > /dev/null
repo_dir=`bk root $repo_dir` repo_dir=`bzr root $repo_dir`
cd $repo_dir cd $repo_dir
doc_dir="$repo_dir/../mysqldoc" doc_dir="$repo_dir/../mysqldoc"
@ -100,7 +100,7 @@ doc_dir="$repo_dir/../mysqldoc"
temp_dir="$build_dir/mysql-$$.tmp" temp_dir="$build_dir/mysql-$$.tmp"
# export the bk tree # export the bk tree
command="bk export"; command="bzr export";
if test $revision; then command="$command -r$revision"; fi if test $revision; then command="$command -r$revision"; fi
command="$command $temp_dir" command="$command $temp_dir"
echo "exporting $repo_dir..." echo "exporting $repo_dir..."
@ -183,6 +183,8 @@ awk 'BEGIN{x=0;} END{printf("\n");} x==1 {printf(" %s",$1); x++; next} x>1 {pri
# build linux tools # build linux tools
echo "compiling linux tools..." echo "compiling linux tools..."
./netware/BUILD/compile-linux-tools ./netware/BUILD/compile-linux-tools
test -f ./netware/init_db.sql # this must exist
test -f ./netware/test_db.sql # this must exist
# compile # compile
if test $build if test $build

3
netware/Makefile.am
View File

@ -107,8 +107,7 @@ init_db.sql: $(top_srcdir)/scripts/mysql_system_tables.sql \
@echo "CREATE DATABASE mysql;" > $@; @echo "CREATE DATABASE mysql;" > $@;
@echo "CREATE DATABASE test;" >> $@; @echo "CREATE DATABASE test;" >> $@;
@echo "use mysql;" >> $@; @echo "use mysql;" >> $@;
@cat $(top_srcdir)/scripts/mysql_system_tables.sql \ @cat $(top_srcdir)/scripts/mysql_system_tables.sql >> $@;
$(top_srcdir)/scripts/mysql_system_tables_fix.sql >> $@;
# Build test_db.sql from init_db.sql plus # Build test_db.sql from init_db.sql plus
# some test data # some test data

20
netware/mysql_install_db.c
View File

@ -324,9 +324,10 @@ void create_paths()
******************************************************************************/ ******************************************************************************/
int mysql_install_db(int argc, char *argv[]) int mysql_install_db(int argc, char *argv[])
{ {
arg_list_t al; arg_list_t al;
int i, j, err; int i, j, err;
char skip; char skip;
struct stat info;
// private options // private options
static char *private_options[] = static char *private_options[] =
@ -362,6 +363,15 @@ int mysql_install_db(int argc, char *argv[])
add_arg(&al, "--skip-grant-tables"); add_arg(&al, "--skip-grant-tables");
add_arg(&al, "--skip-innodb"); add_arg(&al, "--skip-innodb");
if ((err = stat(sql_file, &info)) != 0)
{
printf("ERROR - %s:\n", strerror(errno));
printf("\t%s\n\n", sql_file);
// free args
free_args(&al);
exit(-1);
}
// spawn mysqld // spawn mysqld
err = spawn(mysqld, &al, TRUE, sql_file, out_log, err_log); err = spawn(mysqld, &al, TRUE, sql_file, out_log, err_log);
@ -394,9 +404,9 @@ int main(int argc, char **argv)
// install the database // install the database
if (mysql_install_db(argc, argv)) if (mysql_install_db(argc, argv))
{ {
printf("ERROR - The database creation failed!\n"); printf("ERROR - Failed to create the database!\n");
printf(" %s\n", strerror(errno)); printf(" %s\n", strerror(errno));
printf("See the following log for more infomration:\n"); printf("See the following log for more information:\n");
printf("\t%s\n\n", err_log); printf("\t%s\n\n", err_log);
exit(-1); exit(-1);
} }