Below is the list of changes that have just been committed into a local
5.0 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-09 00:48:40+01:00, tsmith@stripped +5 -0
WL#3670. Add DISABLE_GRANT_OPTIONS #define, and configure --disable-grant-options. Removes the --init-file, --bootstrap and --skip-grant-tables mysqld options.
configure.in@stripped, 2007-01-09 00:48:06+01:00, tsmith@stripped +16 -0
WL#3670. Add DISABLE_GRANT_OPTIONS #define, and configure --disable-grant-options. Removes the --init-file, --bootstrap and --skip-grant-tables mysqld options.
sql/CMakeLists.txt@stripped, 2007-01-09 00:48:07+01:00, tsmith@stripped +4 -0
WL#3670. Add DISABLE_GRANT_OPTIONS #define, and configure --disable-grant-options. Removes the --init-file, --bootstrap and --skip-grant-tables mysqld options.
sql/mysqld.cc@stripped, 2007-01-09 00:48:07+01:00, tsmith@stripped +6 -0
WL#3670. Add DISABLE_GRANT_OPTIONS #define, and configure --disable-grant-options. Removes the --init-file, --bootstrap and --skip-grant-tables mysqld options.
win/README@stripped, 2007-01-09 00:48:07+01:00, tsmith@stripped +3 -0
WL#3670. Add DISABLE_GRANT_OPTIONS #define, and configure --disable-grant-options. Removes the --init-file, --bootstrap and --skip-grant-tables mysqld options.
win/configure.js@stripped, 2007-01-09 00:48:07+01:00, tsmith@stripped +1 -0
WL#3670. Add DISABLE_GRANT_OPTIONS #define, and configure --disable-grant-options. Removes the --init-file, --bootstrap and --skip-grant-tables mysqld options.
# 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: quadxeon.mysql.com
# Root: /benchmarks/ext3/TOSAVE/tsmith/bk/mysql-5.0.32
--- 1.412/configure.in 2007-01-09 00:48:50 +01:00
+++ 1.413/configure.in 2007-01-09 00:48:50 +01:00
@@ -713,6 +713,22 @@
AC_MSG_RESULT([no])
fi
+# If we should allow init-file and skip-grant-table options
+AC_MSG_CHECKING(If we should should enable init-file and skip-grant-table options)
+AC_ARG_ENABLE(grant-options,
+ [ --disable-grant-options Disables the use of --init-file and --skip-grant-tables options],
+ [ DISABLE_GRANT_OPTIONS=$enableval ],
+ [ DISABLE_GRANT_OPTIONS=no ]
+ )
+if test "$DISABLE_GRANT_OPTIONS" = "yes"
+then
+ AC_MSG_RESULT([yes])
+ AC_DEFINE([DISABLE_GRANT_OPTIONS], [1],
+ [Disables the use of --init-file and --skip-grant-tables options])
+else
+ AC_MSG_RESULT([no])
+fi
+
MYSQL_SYS_LARGEFILE
# Types that must be checked AFTER large file support is checked
--- 1.583/sql/mysqld.cc 2007-01-09 00:48:50 +01:00
+++ 1.584/sql/mysqld.cc 2007-01-09 00:48:50 +01:00
@@ -4775,8 +4775,10 @@
{"binlog-ignore-db", OPT_BINLOG_IGNORE_DB,
"Tells the master that updates to the given database should not be logged tothe binary log.",
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+#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,
@@ -4892,9 +4894,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",
@@ -5349,10 +5353,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.2/sql/CMakeLists.txt 2007-01-09 00:48:50 +01:00
+++ 1.3/sql/CMakeLists.txt 2007-01-09 00:48:50 +01:00
@@ -25,6 +25,10 @@
ADD_DEFINITIONS(-DHAVE_INNOBASE -DMYSQL_SERVER
-D_CONSOLE -DHAVE_DLOPEN)
+
+IF(DISABLE_GRANT_OPTIONS)
+ ADD_DEFINITIONS(-DDISABLE_GRANT_OPTIONS)
+ENDIF(DISABLE_GRANT_OPTIONS)
ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc
discover.cc ../libmysql/errmsg.c field.cc field_conv.cc
--- 1.1/win/README 2007-01-09 00:48:50 +01:00
+++ 1.2/win/README 2007-01-09 00:48:50 +01:00
@@ -49,6 +49,9 @@
COMPILATION_COMMENT=<comment> Server comment, default "Source distribution"
MYSQL_TCP_PORT=<port> Server port, default 3306
CYBOZU
+ DISABLE_GRANT_OPTIONS Disables the use of --init-file and --skip-grant-tables
+ options of mysqld.exe
+
So the command line could look like:
--- 1.1/win/configure.js 2007-01-09 00:48:50 +01:00
+++ 1.2/win/configure.js 2007-01-09 00:48:50 +01:00
@@ -32,6 +32,7 @@
case "WITH_PARTITION_STORAGE_ENGINE":
case "__NT__":
case "CYBOZU":
+ case "DISABLE_GRANT_OPTIONS":
configfile.WriteLine("SET (" + args.Item(i) + " TRUE)");
break;
case "MYSQL_SERVER_SUFFIX":
| Thread |
|---|
| • bk commit into 5.0 tree (tsmith:1.2359) | tim | 9 Jan |
