Below is the list of changes that have just been committed into a local
5.1 repository of tsmith. When tsmith does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-01-11 13:50:48-07:00, tsmith@stripped +9 -0
Merge siva.hindu.god:/home/tsmith/m/bk/mysql-5.0-build
into siva.hindu.god:/home/tsmith/m/bk/mysql-5.1-build
MERGE: 1.1810.2405.12
BitKeeper/deleted/.del-CMakeLists.txt~3@stripped, 2007-01-11 13:44:17-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.1.3.2
BitKeeper/deleted/.del-CMakeLists.txt~3@stripped, 2007-01-11 13:44:16-07:00, tsmith@stripped +0 -0
Merge rename: sql/CMakeLists.txt -> BitKeeper/deleted/.del-CMakeLists.txt~3
BitKeeper/deleted/.del-README~1@stripped, 2007-01-11 13:44:17-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.1.1.2
BitKeeper/deleted/.del-README~1@stripped, 2007-01-11 13:44:16-07:00, tsmith@stripped +0 -0
Merge rename: win/README -> BitKeeper/deleted/.del-README~1
BitKeeper/deleted/.del-configure.js@stripped, 2007-01-11 13:44:17-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.1.2.2
BitKeeper/deleted/.del-configure.js@stripped, 2007-01-11 13:44:16-07:00, tsmith@stripped +0 -0
Merge rename: win/configure.js -> BitKeeper/deleted/.del-configure.js
BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad@stripped, 2007-01-11 13:44:17-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.15.1.2
BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad@stripped, 2007-01-11 13:44:16-07:00, tsmith@stripped +0 -0
Merge rename: mysql-test/mysql_test_run_new.c -> BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad
configure.in@stripped, 2007-01-11 13:50:44-07:00, tsmith@stripped +0 -1
Manual merge
MERGE: 1.245.73.2
mysql-test/install_test_db.sh@stripped, 2007-01-11 13:50:44-07:00, tsmith@stripped +1 -4
Manual merge
MERGE: 1.35.2.1
mysql-test/mysql-test-run.pl@stripped, 2007-01-11 13:44:17-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.30.67.1
scripts/mysql_install_db.sh@stripped, 2007-01-11 13:44:17-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.64.2.1
sql/mysqld.cc@stripped, 2007-01-11 13:50:44-07:00, tsmith@stripped +1 -1
Manual merge
MERGE: 1.439.81.1
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: tsmith
# Host: siva.hindu.god
# Root: /home/tsmith/m/bk/mysql-5.1-build/RESYNC
--- 1.413/configure.in 2007-01-11 12:20:27 -07:00
+++ 1.414/configure.in 2007-01-11 13:50:44 -07:00
@@ -678,7 +678,22 @@
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
# Types that must be checked AFTER large file support is checked
--- 1.39/mysql-test/install_test_db.sh 2006-12-30 17:06:32 -07:00
+++ 1.40/mysql-test/install_test_db.sh 2007-01-11 13:50:44 -07:00
@@ -66,14 +66,17 @@
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 @@
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
--- 1.69/scripts/mysql_install_db.sh 2006-12-30 17:06:33 -07:00
+++ 1.70/scripts/mysql_install_db.sh 2007-01-11 13:44:17 -07:00
@@ -236,7 +236,8 @@
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 \
--- 1.604/sql/mysqld.cc 2007-01-01 01:55:32 -07:00
+++ 1.605/sql/mysqld.cc 2007-01-11 13:50:44 -07:00
@@ -4970,8 +4970,10 @@
/* 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 @@
{"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 @@
"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,
--- 1.1.3.1/sql/CMakeLists.txt 2007-01-09 19:21:58 -07:00
+++ 1.5/BitKeeper/deleted/.del-CMakeLists.txt~3 2007-01-11 13:44:17 -07:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 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; version 2 of the License.
+#
+# 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
SET(CMAKE_CXX_FLAGS_DEBUG
"${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi")
SET(CMAKE_C_FLAGS_DEBUG
--- 1.1.2.1/win/configure.js 2007-01-09 19:21:58 -07:00
+++ 1.4/BitKeeper/deleted/.del-configure.js 2007-01-11 13:44:17 -07:00
@@ -1,4 +1,19 @@
// Configure.js
+//
+// Copyright (C) 2006 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; version 2 of the License.
+//
+// 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
ForReading = 1;
ForWriting = 2;
--- 1.257/mysql-test/mysql-test-run.pl 2007-01-11 11:39:45 -07:00
+++ 1.258/mysql-test/mysql-test-run.pl 2007-01-11 13:44:17 -07:00
@@ -2873,12 +2873,19 @@
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 )
| Thread |
|---|
| • bk commit into 5.1 tree (tsmith:1.2383) | tim | 11 Jan |
