Commit 675610ff authored by Chad MILLER's avatar Chad MILLER
Browse files

Merge from bugteam trunk.

parents 652fa1ad 99545746

netware/BUILD/compile-linux-tools

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ make 
# so the file will be linked

(cd sql; make sql_yacc.cc)



# we need initilizing SQL files.

(cd netware; make test_db.sql init_db.sql)



# copying required linux tools

cp extra/comp_err extra/comp_err.linux

cp libmysql/conf_to_src libmysql/conf_to_src.linux

netware/BUILD/nwbootstrap

+5 −3
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ done 
echo "starting build..."



# check for bk and repo_dir

bk help > /dev/null

repo_dir=`bk root $repo_dir`

bzr help > /dev/null

repo_dir=`bzr root $repo_dir`

cd $repo_dir

doc_dir="$repo_dir/../mysqldoc"
@@ -100,7 +100,7 @@ doc_dir="$repo_dir/../mysqldoc" 
temp_dir="$build_dir/mysql-$$.tmp"



# export the bk tree

command="bk export";

command="bzr export";

if test $revision; then command="$command -r$revision"; fi

command="$command $temp_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

echo "compiling 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

if test $build

netware/Makefile.am

+1 −2
Original line number Diff line number Diff line
@@ -107,8 +107,7 @@ init_db.sql: $(top_srcdir)/scripts/mysql_system_tables.sql \ 
	@echo "CREATE DATABASE mysql;" > $@;

	@echo "CREATE DATABASE test;" >> $@;

	@echo "use mysql;" >> $@;

	@cat $(top_srcdir)/scripts/mysql_system_tables.sql \

	     $(top_srcdir)/scripts/mysql_system_tables_fix.sql >> $@;

	@cat $(top_srcdir)/scripts/mysql_system_tables.sql >> $@;



# Build test_db.sql from init_db.sql plus

# some test data

netware/mysql_install_db.c

+15 −5
Original line number Diff line number Diff line
@@ -327,6 +327,7 @@ int mysql_install_db(int argc, char *argv[]) 
  arg_list_t al;

  int i, j, err;

  char skip;

  struct stat info;

  

  // 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-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

  err = spawn(mysqld, &al, TRUE, sql_file, out_log, err_log);
@@ -394,9 +404,9 @@ int main(int argc, char **argv) 
	// install the database

  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("See the following log for more infomration:\n");

    printf("See the following log for more information:\n");

    printf("\t%s\n\n", err_log);

    exit(-1);

  }