From 3fb65b4dd47889721744fe9d62aa9ce004773db7 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 30 Nov 2007 06:14:43 +0100 Subject: Bug #32219: too many hosts in default grant tables 6.0.3 Fix is to remove any references to the current hostname when running mysql_install_db --cross-bootstrap. (The dist-hook make target makes this call, and the resulting data directory is included in the source distribution as win/data/*.) Also, a few other clean-ups to mysql_install_db while there. Makefile.am: Adapt to clean-up in mysql_install_db (--windows becomes --cross-bootstrap) scripts/mysql_install_db.sh: Filter out references to the current hostname when performing a cross-bootstrap installation by removing any lines which contain the string "@current_hostname". Deprecate the old --windows option; use --cross-bootstrap instead, since it more accurately reflects the purpose. Other clean-up: the wrong syntax was being used to test the exit status of mysqld --bootstrap. It mostly worked, as long as mysqld succeeded. However, it was not robust. scripts/mysql_system_tables_data.sql: Rename local @hostname variable to @current_hostname, which is a more unique label to search on. mysql_install_db now filters out all lines which include "@current_hostname" during a --cross-bootstrap installation. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index c1bdbb22e8e..52a9dcbd389 100644 --- a/Makefile.am +++ b/Makefile.am @@ -102,7 +102,7 @@ dist-hook: rm -rf `find $(distdir) -type d -name SCCS -print` rm -f `find $(distdir) -type l -print` mkdir -p $(distdir)/win - scripts/mysql_install_db --no-defaults --windows \ + scripts/mysql_install_db --no-defaults --cross-bootstrap \ --basedir=$(top_builddir) \ --datadir=$(distdir)/win/data \ --srcdir=$(top_srcdir) -- cgit v1.2.1