Commit 44318bbb authored by unknown's avatar unknown
Browse files

Merge siva.hindu.god:/home/tsmith/m/bk/mysql-5.0-build 

into  siva.hindu.god:/home/tsmith/m/bk/mysql-5.1-build


BitKeeper/deleted/.del-CMakeLists.txt~3:
  Auto merged
BitKeeper/deleted/.del-README~1:
  Auto merged
BitKeeper/deleted/.del-configure.js:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
configure.in:
  Manual merge
mysql-test/install_test_db.sh:
  Manual merge
sql/mysqld.cc:
  Manual merge
parents e64f4fde a4817ace

configure.in

+16 −1
Original line number Diff line number Diff line
@@ -678,6 +678,21 @@ else 
  AC_MSG_RESULT([no])

fi



# If we should allow init-file, skip-grant-table and bootstrap options

AC_MSG_CHECKING(If we should should enable init-file, skip-grant-table options and bootstrap)

AC_ARG_ENABLE(grant-options,

    [  --disable-grant-options Disables the use of --init-file, --skip-grant-tables and --bootstrap options],

    [ mysql_grant_options_enabled=$enableval ],

    [ mysql_grant_options_enabled=yes ]

    )

if test "$mysql_grant_options_enabled" = "yes"

then

  AC_MSG_RESULT([yes])

else

  AC_DEFINE([DISABLE_GRANT_OPTIONS], [1],

            [Disables the use of --init-file, --skip-grant-tables and --bootstrap options])

  AC_MSG_RESULT([no])

fi



MYSQL_SYS_LARGEFILE

mysql-test/install_test_db.sh

+8 −3
Original line number Diff line number Diff line
@@ -66,14 +66,17 @@ ldata=$fix_bin/$data 
mdata=$data/mysql

EXTRA_ARG=""



if test ! -x $execdir/mysqld

mysqld=

if test -x $execdir/mysqld

then

  mysqld=$execdir/mysqld

else

  if test ! -x $libexecdir/mysqld

  then

    echo "mysqld is missing - looked in $execdir and in $libexecdir"

    exit 1

  else

    execdir=$libexecdir

    mysqld=$libexecdir/mysqld

  fi

fi
@@ -99,7 +102,9 @@ basedir=. 
EXTRA_ARG="--language=../sql/share/english/ --character-sets-dir=../sql/share/charsets/"

fi



mysqld_boot=" $execdir/mysqld --no-defaults --bootstrap --skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb --skip-ndbcluster --tmpdir=. $EXTRA_ARG"

mysqld_boot="${MYSQLD_BOOTSTRAP-$mysqld}"



mysqld_boot="$mysqld_boot --no-defaults --bootstrap --skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb --skip-ndbcluster --tmpdir=. $EXTRA_ARG"

echo "running $mysqld_boot"



if $scriptdir/mysql_create_system_tables test $mdata $hostname | $mysqld_boot

mysql-test/mysql-test-run.pl

+9 −2
Original line number Diff line number Diff line
@@ -2873,12 +2873,19 @@ sub install_db ($$) { 
    mtr_add_arg($args, "--character-sets-dir=%s", $path_charsetsdir);

  }



  # If DISABLE_GRANT_OPTIONS is defined when the server is compiled (e.g.,

  # configure --disable-grant-options), mysqld will not recognize the

  # --bootstrap or --skip-grant-tables options.  The user can set

  # MYSQLD_BOOTSTRAP to the full path to a mysqld which does accept

  # --bootstrap, to accommodate this.

  my $exe_mysqld_bootstrap = $ENV{'MYSQLD_BOOTSTRAP'} || $exe_mysqld;



  # Log bootstrap command

  my $path_bootstrap_log= "$opt_vardir/log/bootstrap.log";

  mtr_tofile($path_bootstrap_log,

	     "$exe_mysqld " . join(" ", @$args) . "\n");

	     "$exe_mysqld_bootstrap " . join(" ", @$args) . "\n");



  if ( mtr_run($exe_mysqld, $args, $init_db_sql_tmp,

  if ( mtr_run($exe_mysqld_bootstrap, $args, $init_db_sql_tmp,

               $path_bootstrap_log, $path_bootstrap_log,

	       "", { append_log_file => 1 }) != 0 )

scripts/mysql_install_db.sh

+2 −1
Original line number Diff line number Diff line
@@ -236,7 +236,8 @@ if test "$in_rpm" -eq 0 -a "$windows" -eq 0 
then

  echo "Installing all prepared tables"

fi

mysqld_install_cmd_line="$mysqld $defaults $mysqld_opt --bootstrap \

mysqld_bootstrap="${MYSQLD_BOOTSTRAP-$mysqld}"

mysqld_install_cmd_line="$mysqld_bootstrap $defaults $mysqld_opt --bootstrap \

--skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb \

--skip-ndbcluster $args --max_allowed_packet=8M --net_buffer_length=16K"

if $scriptdir/mysql_create_system_tables $create_option $mdata $hostname $windows \

sql/mysqld.cc

+6 −0
Original line number Diff line number Diff line
@@ -4970,8 +4970,10 @@ struct my_option my_long_options[] = 
   /* app_type */ 0

  },

#endif

#ifndef DISABLE_GRANT_OPTIONS

  {"bootstrap", OPT_BOOTSTRAP, "Used by mysql installation scripts.", 0, 0, 0,

   GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"character-set-client-handshake", OPT_CHARACTER_SET_CLIENT_HANDSHAKE,

   "Don't ignore client side character set value sent during handshake.",

   (gptr*) &opt_character_set_client_handshake,
@@ -5094,9 +5096,11 @@ Disable with --skip-large-pages.", 
  {"init-connect", OPT_INIT_CONNECT, "Command(s) that are executed for each new connection",

   (gptr*) &opt_init_connect, (gptr*) &opt_init_connect, 0, GET_STR_ALLOC,

   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

#ifndef DISABLE_GRANT_OPTIONS

  {"init-file", OPT_INIT_FILE, "Read SQL commands from this file at startup.",

   (gptr*) &opt_init_file, (gptr*) &opt_init_file, 0, GET_STR, REQUIRED_ARG,

   0, 0, 0, 0, 0, 0},

#endif

  {"init-rpl-role", OPT_INIT_RPL_ROLE, "Set the replication role.", 0, 0, 0,

   GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"init-slave", OPT_INIT_SLAVE, "Command(s) that are executed when a slave connects to this master",
@@ -5601,10 +5605,12 @@ Can't be set to 1 if --log-slave-updates is used.", 
   "Show user and password in SHOW SLAVE HOSTS on this master",

   (gptr*) &opt_show_slave_auth_info, (gptr*) &opt_show_slave_auth_info, 0,

   GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

#ifndef DISABLE_GRANT_OPTIONS

  {"skip-grant-tables", OPT_SKIP_GRANT,

   "Start without grant tables. This gives all users FULL ACCESS to all tables!",

   (gptr*) &opt_noacl, (gptr*) &opt_noacl, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0,

   0},

#endif

  {"skip-host-cache", OPT_SKIP_HOST_CACHE, "Don't cache host names.", 0, 0, 0,

   GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"skip-locking", OPT_SKIP_LOCK,