summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/CMakeLists.txt14
-rw-r--r--scripts/Makefile.am13
-rw-r--r--scripts/make_binary_distribution.sh73
-rwxr-xr-xscripts/make_win_bin_dist113
-rw-r--r--scripts/make_win_src_distribution.sh552
-rw-r--r--scripts/mysql_convert_table_format.sh4
-rw-r--r--scripts/mysql_explain_log.sh413
-rw-r--r--scripts/mysql_install_db.sh2
-rw-r--r--scripts/mysql_prepare_privilege_tables_for_5.sql53
-rw-r--r--scripts/mysql_system_tables.sql30
-rw-r--r--scripts/mysql_system_tables_data.sql10
-rw-r--r--scripts/mysql_system_tables_fix.sql89
-rw-r--r--scripts/mysql_tableinfo.sh494
-rw-r--r--scripts/mysql_upgrade_shell.sh215
-rw-r--r--scripts/mysqld_safe-watch.sh150
-rw-r--r--scripts/mysqld_safe.sh77
16 files changed, 290 insertions, 2012 deletions
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index bca0581ecbc..e9113b098da 100755
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -13,20 +13,30 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# Build mysql_fix_privilege_tables.sql
+ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_SOURCE_DIR}/scripts/mysql_fix_privilege_tables.sql
+ COMMAND copy /b
+ mysql_system_tables.sql + mysql_system_tables_fix.sql
+ mysql_fix_privilege_tables.sql
+ DEPENDS
+ ${PROJECT_SOURCE_DIR}/scripts/mysql_system_tables.sql
+ ${PROJECT_SOURCE_DIR}/scripts/mysql_system_tables_fix.sql)
+# Build comp_sql - used for embedding SQL in C or C++ programs
ADD_EXECUTABLE(comp_sql comp_sql.c)
TARGET_LINK_LIBRARIES(comp_sql dbug mysys strings)
-# Build comp_sql - used for embedding SQL in C or C++ programs
+# Use comp_sql to build mysql_fix_privilege_tables_sql.c
GET_TARGET_PROPERTY(COMP_SQL_EXE comp_sql LOCATION)
ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_SOURCE_DIR}/scripts/mysql_fix_privilege_tables_sql.c
COMMAND ${COMP_SQL_EXE}
mysql_fix_privilege_tables
mysql_fix_privilege_tables.sql
- mysql_fix_privilege_tables_sql.c
+ mysql_fix_privilege_tables_sql.c
DEPENDS comp_sql ${PROJECT_SOURCE_DIR}/scripts/mysql_fix_privilege_tables.sql)
+# Add dummy target for the above to be built
ADD_CUSTOM_TARGET(GenFixPrivs
ALL
DEPENDS ${PROJECT_SOURCE_DIR}/scripts/mysql_fix_privilege_tables_sql.c)
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 79f4666f855..9d344118f2b 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -34,18 +34,13 @@ bin_SCRIPTS = @server_scripts@ \
mysql_find_rows \
mysqlhotcopy \
mysqldumpslow \
- mysql_explain_log \
- mysql_tableinfo \
- mysql_upgrade_shell \
mysqld_multi
noinst_SCRIPTS = make_binary_distribution \
- make_sharedlib_distribution \
- make_win_src_distribution
+ make_sharedlib_distribution
EXTRA_SCRIPTS = make_binary_distribution.sh \
make_sharedlib_distribution.sh \
- make_win_src_distribution.sh \
msql2mysql.sh \
mysql_config.sh \
mysql_fix_privilege_tables.sh \
@@ -60,10 +55,7 @@ EXTRA_SCRIPTS = make_binary_distribution.sh \
mysql_find_rows.sh \
mysqlhotcopy.sh \
mysqldumpslow.sh \
- mysql_explain_log.sh \
mysqld_multi.sh \
- mysql_tableinfo.sh \
- mysql_upgrade_shell.sh \
mysqld_safe.sh
EXTRA_DIST = $(EXTRA_SCRIPTS) \
@@ -94,11 +86,8 @@ CLEANFILES = @server_scripts@ \
mysql_find_rows \
mysqlhotcopy \
mysqldumpslow \
- mysql_explain_log \
mysql_tableinfo \
- mysql_upgrade_shell \
mysqld_multi \
- make_win_src_distribution \
mysql_fix_privilege_tables.sql \
mysql_fix_privilege_tables_sql.c
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index e8bf39bd016..83d7e237a54 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -54,6 +54,21 @@ for arg do
esac
done
+# Avoid too long command lines for cp (bug#27489)
+MCP() {
+ for i
+ do
+ last=$i
+ done
+ for i
+ do
+ if test "x$i" != "x$last"
+ then
+ cp -p $i $last
+ fi
+ done
+}
+
# Remove vendor from $system
system=`echo $system | sed -e 's/[a-z]*-\(.*\)/\1/g'`
@@ -106,7 +121,9 @@ esac
mkdir $BASE $BASE/bin $BASE/docs \
$BASE/include $BASE/lib $BASE/support-files $BASE/share $BASE/scripts \
$BASE/mysql-test $BASE/mysql-test/t $BASE/mysql-test/r \
- $BASE/mysql-test/include $BASE/mysql-test/std_data $BASE/mysql-test/lib
+ $BASE/mysql-test/include $BASE/mysql-test/std_data $BASE/mysql-test/lib \
+ $BASE/mysql-test/extra \
+ $BASE/mysql-test/extra/binlog_tests $BASE/mysql-test/extra/rpl_tests
if [ $BASE_SYSTEM != "netware" ] ; then
mkdir $BASE/share/mysql $BASE/tests $BASE/sql-bench $BASE/man \
@@ -146,12 +163,13 @@ copyfileto $BASE COPYING COPYING.LIB README Docs/INSTALL-BINARY \
BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \
extra/resolveip$BS extra/my_print_defaults$BS \
extra/resolve_stack_dump$BS extra/mysql_waitpid$BS \
- myisam/myisamchk$BS myisam/myisampack$BS myisam/myisamlog$BS \
- myisam/myisam_ftdump$BS \
+ storage/myisam/myisamchk$BS storage/myisam/myisampack$BS \
+ storage/myisam/myisamlog$BS storage/myisam/myisam_ftdump$BS \
sql/mysqld$BS sql/mysqld-debug$BS \
sql/mysql_tzinfo_to_sql$BS \
server-tools/instance-manager/mysqlmanager$BS \
client/mysql$BS client/mysqlshow$BS client/mysqladmin$BS \
+ client/mysqlslap$BS \
client/mysqldump$BS client/mysqlimport$BS \
client/mysqltest$BS client/mysqlcheck$BS \
client/mysqlbinlog$BS client/mysql_upgrade$BS \
@@ -164,20 +182,18 @@ BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \
if [ $BASE_SYSTEM = "netware" ] ; then
BIN_FILES="$BIN_FILES \
netware/mysqld_safe$BS netware/mysql_install_db$BS \
- netware/init_db.sql netware/test_db.sql netware/mysql_explain_log$BS \
+ netware/init_db.sql netware/test_db.sql$BS \
netware/mysqlhotcopy$BS netware/libmysql$BS netware/init_secure_db.sql \
";
# For all other platforms:
else
BIN_FILES="$BIN_FILES \
server-tools/instance-manager/.libs/mysqlmanager \
- client/mysqltestmanagerc \
- client/mysqltestmanager-pwgen tools/mysqltestmanager \
client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin \
+ client/.libs/mysqlslap \
client/.libs/mysqldump client/.libs/mysqlimport \
client/.libs/mysqltest client/.libs/mysqlcheck \
- client/.libs/mysqlbinlog client/.libs/mysqltestmanagerc \
- client/.libs/mysqltestmanager-pwgen tools/.libs/mysqltestmanager \
+ client/.libs/mysqlbinlog \
tests/.libs/mysql_client_test \
libmysqld/examples/.libs/mysql_client_test_embedded \
libmysqld/examples/.libs/mysqltest_embedded \
@@ -190,8 +206,9 @@ if [ x$STRIP = x1 ] ; then
strip $BASE/bin/*
fi
-# Copy not binary files
-copyfileto $BASE/bin sql/mysqld.sym.gz
+# Obsolete, starting from 5.1.6-beta
+# # Copy not binary files
+# copyfileto $BASE/bin sql/mysqld.sym.gz
if [ $BASE_SYSTEM = "netware" ] ; then
$CP netware/*.pl $BASE/scripts
@@ -257,22 +274,25 @@ copyfileto $BASE/mysql-test \
mysql-test/valgrind.supp \
netware/mysql_test_run.nlm netware/install_test_db.ncf
-$CP mysql-test/lib/*.pl $BASE/mysql-test/lib
-$CP mysql-test/t/*.def $BASE/mysql-test/t
-$CP mysql-test/include/*.inc $BASE/mysql-test/include
-$CP mysql-test/include/*.test $BASE/mysql-test/include
-$CP mysql-test/t/*.def $BASE/mysql-test/t
-$CP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \
+MCP mysql-test/lib/*.pl $BASE/mysql-test/lib
+MCP mysql-test/t/*.def $BASE/mysql-test/t
+MCP mysql-test/include/*.inc $BASE/mysql-test/include
+MCP mysql-test/include/*.test $BASE/mysql-test/include
+MCP mysql-test/t/*.def $BASE/mysql-test/t
+MCP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \
mysql-test/std_data/*.MYD mysql-test/std_data/*.MYI \
mysql-test/std_data/*.pem mysql-test/std_data/Moscow_leap \
mysql-test/std_data/des_key_file mysql-test/std_data/*.*001 \
mysql-test/std_data/*.cnf mysql-test/std_data/*.MY* \
$BASE/mysql-test/std_data
-$CP mysql-test/t/*.test mysql-test/t/*.imtest \
- mysql-test/t/*.disabled mysql-test/t/*.opt \
- mysql-test/t/*.slave-mi mysql-test/t/*.sh mysql-test/t/*.sql $BASE/mysql-test/t
-$CP mysql-test/r/*.result mysql-test/r/*.require \
- $BASE/mysql-test/r
+MCP mysql-test/t/*.test $BASE/mysql-test/t
+MCP mysql-test/t/*.imtest mysql-test/t/*.disabled $BASE/mysql-test/t
+MCP mysql-test/t/*.opt mysql-test/t/*.slave-mi $BASE/mysql-test/t
+MCP mysql-test/t/*.sh mysql-test/t/*.sql $BASE/mysql-test/t
+MCP mysql-test/r/*.result $BASE/mysql-test/r
+MCP mysql-test/r/*.require $BASE/mysql-test/r
+MCP mysql-test/extra/binlog_tests/*.test $BASE/mysql-test/extra/binlog_tests
+MCP mysql-test/extra/rpl_tests/*.test $BASE/mysql-test/extra/rpl_tests
if [ $BASE_SYSTEM != "netware" ] ; then
chmod a+x $BASE/bin/*
@@ -328,21 +348,24 @@ if [ $BASE_SYSTEM != "netware" ] ; then
fi
# Clean up if we did this from a bk tree
-if [ -d $BASE/sql-bench/SCCS ] ; then
+if [ -d $BASE/share/SCCS ] ; then
find $BASE/share -name SCCS -print | xargs rm -rf
find $BASE/sql-bench -name SCCS -print | xargs rm -rf
fi
# NDB Cluster
if [ x$NDBCLUSTER = x1 ]; then
- ( cd ndb ; @MAKE@ DESTDIR=$BASE/ndb-stage install )
- ( cd mysql-test/ndb ; @MAKE@ DESTDIR=$BASE/ndb-stage install )
+ ( cd storage/ndb ; @MAKE@ DESTDIR=$BASE/ndb-stage install )
+ ( cd mysql-test ; @MAKE@ DESTDIR=$BASE/ndb-stage install )
$CP $BASE/ndb-stage@bindir@/* $BASE/bin/.
$CP $BASE/ndb-stage@libexecdir@/* $BASE/bin/.
$CP $BASE/ndb-stage@pkglibdir@/* $BASE/lib/.
$CP $BASE/ndb-stage@pkgdatadir@/* $BASE/share/mysql/.
- $CP -r $BASE/ndb-stage@pkgincludedir@/ndb $BASE/include
+ test -d $BASE/include/storage || mkdir $BASE/include/storage
+ $CP -r $BASE/ndb-stage@pkgincludedir@/storage/ndb $BASE/include/storage/
$CP -r $BASE/ndb-stage@prefix@/mysql-test/ndb $BASE/mysql-test/. || exit 1
+ $CP -r $BASE/ndb-stage@prefix@/mysql-test/std_data/ndb_backup50 $BASE/mysql-test/std_data/. || exit 1
+ $CP -r $BASE/ndb-stage@prefix@/mysql-test/std_data/ndb_backup51 $BASE/mysql-test/std_data/. || exit 1
rm -rf $BASE/ndb-stage
fi
diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist
index 87d35a0850b..42fade7cbd2 100755
--- a/scripts/make_win_bin_dist
+++ b/scripts/make_win_bin_dist
@@ -126,8 +126,6 @@ if [ -e $DESTDIR ] ; then
usage
fi
-trap 'echo "Clearning up and exiting..." ; rm -fr $DESTDIR; exit 1' ERR
-
# ----------------------------------------------------------------------
# Adjust target name if needed, release with debug info has another name
# ----------------------------------------------------------------------
@@ -138,45 +136,40 @@ then
fi
# ----------------------------------------------------------------------
-# Copy executables, and client DLL
+# Copy executables, and client DLL (FIXME why?)
# ----------------------------------------------------------------------
+trap 'echo "Clearning up and exiting..." ; rm -fr $DESTDIR; exit 1' ERR
+
mkdir $DESTDIR
mkdir $DESTDIR/bin
-cp client/$TARGET/*.exe $DESTDIR/bin/
-cp extra/$TARGET/*.exe $DESTDIR/bin/
-cp myisam/$TARGET/*.exe $DESTDIR/bin/
-cp server-tools/instance-manager/$TARGET/*.exe $DESTDIR/bin/
-cp server-tools/instance-manager/$TARGET/*.pdb $DESTDIR/bin/ || true
-cp server-tools/instance-manager/$TARGET/*.map $DESTDIR/bin/ || true
-cp tests/$TARGET/*.exe $DESTDIR/bin/
-cp libmysql/$TARGET/libmysql.dll $DESTDIR/bin/
+cp client/$TARGET/*.exe $DESTDIR/bin/
+cp extra/$TARGET/*.exe $DESTDIR/bin/
+cp storage/myisam/$TARGET/*.exe $DESTDIR/bin/
+cp server-tools/instance-manager/$TARGET/*.{exe,map} $DESTDIR/bin/
+if [ x"$TARGET" != x"release" ]
+then
+ cp server-tools/instance-manager/$TARGET/*.pdb $DESTDIR/bin/
+fi
+cp tests/$TARGET/*.exe $DESTDIR/bin/
+cp libmysql/$TARGET/*.exe $DESTDIR/bin/
+cp libmysql/$TARGET/libmysql.dll $DESTDIR/bin/
# FIXME really needed?!
mv $DESTDIR/bin/comp_err.exe $DESTDIR/bin/comp-err.exe
-if [ -f "sql/$TARGET/mysqld-nt.exe" ] ; then
- BASENAME="mysqld-nt" # Old style non CMake build
-else
- BASENAME="mysqld" # New style CMake build
-fi
-
-# Depending on Visual Studio target, the optimized server has symbols
-cp sql/$TARGET/$BASENAME.exe $DESTDIR/bin/$BASENAME$EXE_SUFFIX.exe
-cp sql/$TARGET/$BASENAME.pdb $DESTDIR/bin/$BASENAME$EXE_SUFFIX.pdb || true
-cp sql/$TARGET/$BASENAME.map $DESTDIR/bin/$BASENAME$EXE_SUFFIX.map || true
-
-if [ -f "sql/debug/mysqld-debug.exe" ] ; then
- BASENAME="mysqld-debug" # Old style non CMake build
-else
- BASENAME="mysqld" # New style CMake build
+cp sql/$TARGET/mysqld.exe $DESTDIR/bin/mysqld$EXE_SUFFIX.exe
+cp sql/$TARGET/mysqld.map $DESTDIR/bin/mysqld$EXE_SUFFIX.map
+if [ x"$TARGET" != x"release" ]
+then
+ cp sql/$TARGET/mysqld.pdb $DESTDIR/bin/mysqld$EXE_SUFFIX.pdb
fi
-if [ x"$PACK_DEBUG" = "" -a -f "sql/debug/$BASENAME.exe" -o \
+if [ x"$PACK_DEBUG" = "" -a -f "sql/debug/mysqld.exe" -o \
x"$PACK_DEBUG" = "yes" ] ; then
- cp sql/debug/$BASENAME.exe $DESTDIR/bin/mysqld-debug.exe
- cp sql/debug/$BASENAME.pdb $DESTDIR/bin/mysqld-debug.pdb
- cp sql/debug/$BASENAME.map $DESTDIR/bin/mysqld-debug.map || true
+ cp sql/debug/mysqld.exe $DESTDIR/bin/mysqld-debug.exe
+ cp sql/debug/mysqld.pdb $DESTDIR/bin/mysqld-debug.pdb
+ cp sql/debug/mysqld.map $DESTDIR/bin/mysqld-debug.map
fi
# ----------------------------------------------------------------------
@@ -185,9 +178,7 @@ fi
# FIXME is there ever a data directory to copy?
if [ -d win/data ] ; then
- cp -pR win/data $DESTDIR/
-elif [ -d data ] ; then
- cp -pR data $DESTDIR/
+ cp -pR win/data $DESTDIR/data
fi
# FIXME maybe a flag to define "release build", or do the
@@ -238,6 +229,27 @@ if [ x"$PACK_EMBEDDED" = "" -a \
fi
# ----------------------------------------------------------------------
+# FIXME test stuff that is useless garbage?
+# ----------------------------------------------------------------------
+
+mkdir -p $DESTDIR/examples/libmysqltest/release
+cp libmysql/mytest.c libmysql/myTest.vcproj libmysql/$TARGET/myTest.exe \
+ $DESTDIR/examples/libmysqltest/
+cp libmysql/$TARGET/myTest.exe $DESTDIR/examples/libmysqltest/release/
+
+if [ x"$PACK_DEBUG" = "" -a -f "libmysql/debug/myTest.exe" -o \
+ x"$PACK_DEBUG" = "yes" ] ; then
+ mkdir -p $DESTDIR/examples/libmysqltest/debug
+ cp libmysql/debug/myTest.exe $DESTDIR/examples/libmysqltest/debug/
+fi
+
+mkdir -p $DESTDIR/examples/tests
+cp tests/*.res tests/*.tst tests/*.pl tests/*.c $DESTDIR/examples/tests/
+
+mkdir -p $DESTDIR/examples/udf_example
+cp sql/udf_example.def sql/udf_example.vcproj sql/udf_example.c $DESTDIR/examples/udf_example/
+
+# ----------------------------------------------------------------------
# FIXME why not copy it all in "include"?!
# ----------------------------------------------------------------------
@@ -254,7 +266,6 @@ cp include/conf*.h \
include/m_string.h \
include/m_ctype.h \
include/my_global.h \
- include/raid.h \
include/typelib.h $DESTDIR/include/
cp libmysql/libmysql.def $DESTDIR/include/
@@ -277,23 +288,14 @@ if [ x"$PACK_DEBUG" = "" -a -f "libmysql/debug/libmysql.lib" -o \
cp libmysql/debug/libmysql.dll \
libmysql/debug/libmysql.lib \
client/debug/mysqlclient.lib \
+ mysys/debug/mysys.lib \
regex/debug/regex.lib \
strings/debug/strings.lib \
zlib/debug/zlib.lib $DESTDIR/lib/debug/
-
- if [ -f "mysys/debug/mysys-nt.lib" ] ; then
- cp mysys/debug/mysys-nt.lib $DESTDIR/lib/debug/
- else
- cp mysys/debug/mysys.lib $DESTDIR/lib/debug/mysys-nt.lib
- fi
-
fi
-if [ -f "mysys/$TARGET/mysys-nt.lib" ] ; then
- cp mysys/$TARGET/mysys-nt.lib $DESTDIR/lib/opt/
-else
- cp mysys/$TARGET/mysys.lib $DESTDIR/lib/opt/mysys-nt.lib
-fi
+# FIXME sort this out...
+cp mysys/$TARGET/mysys.lib $DESTDIR/lib/opt/mysys_tls.lib
# ----------------------------------------------------------------------
# Copy the test directory
@@ -306,14 +308,19 @@ cp mysql-test/mysql-test-run.pl $DESTDIR/mysql-test/
cp mysql-test/README $DESTDIR/mysql-test/
cp mysql-test/install_test_db.sh $DESTDIR/mysql-test/install_test_db
cp mysql-test/include/*.inc $DESTDIR/mysql-test/include/
-cp mysql-test/include/*.test $DESTDIR/mysql-test/include/
cp mysql-test/lib/*.pl $DESTDIR/mysql-test/lib/
-cp mysql-test/lib/*.sql $DESTDIR/mysql-test/lib/ || true
cp mysql-test/r/*.require $DESTDIR/mysql-test/r/
# Need this trick, or we get "argument list too long".
ABS_DST=`pwd`/$DESTDIR
(cd mysql-test/r/ && cp *.result $ABS_DST/mysql-test/r/)
-cp mysql-test/std_data/* $DESTDIR/mysql-test/std_data/
+cp mysql-test/std_data/Moscow_leap $DESTDIR/mysql-test/std_data/
+cp mysql-test/std_data/des_key_file $DESTDIR/mysql-test/std_data/
+cp mysql-test/std_data/*.000001 $DESTDIR/mysql-test/std_data/
+cp mysql-test/std_data/*.cnf $DESTDIR/mysql-test/std_data/
+cp mysql-test/std_data/*.dat $DESTDIR/mysql-test/std_data/
+cp mysql-test/std_data/*.frm $DESTDIR/mysql-test/std_data/
+cp mysql-test/std_data/*.pem $DESTDIR/mysql-test/std_data/
+cp mysql-test/std_data/*.MY* $DESTDIR/mysql-test/std_data/
cp mysql-test/t/*.opt $DESTDIR/mysql-test/t/
cp mysql-test/t/*.sh $DESTDIR/mysql-test/t/
cp mysql-test/t/*.slave-mi $DESTDIR/mysql-test/t/
@@ -352,13 +359,7 @@ for i in `cd scripts && ls`; do \
fi; \
done
-if [ -d "share" ] ; then
- cp -pR share $DESTDIR/
-else
- cp -pR sql/share $DESTDIR/
-fi
-cp -pR sql-bench $DESTDIR/
-rm -f $DESTDIR/sql-bench/*.sh $DESTDIR/sql-bench/Makefile*
+cp -pR sql/share $DESTDIR/
# The SQL initiation code is really expected to be in "share"
mv $DESTDIR/scripts/*.sql $DESTDIR/share/ || true
diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh
deleted file mode 100644
index d6109772060..00000000000
--- a/scripts/make_win_src_distribution.sh
+++ /dev/null
@@ -1,552 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2003-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
-
-# Terminate loudly on error, we don't want partial package
-set -e
-trap "echo '*** script failed ***'" 0
-
-#
-# Script to create a Windows src package
-#
-
-version=@VERSION@
-CP="cp -p"
-
-DEBUG=0
-SILENT=0
-SUFFIX=""
-DIRNAME=""
-OUTTAR="0"
-OUTZIP="0"
-
-#
-# An "abort" function taking a variable number of strings (one per line)
-#
-
-abort()
-{
- for line
- do
- echo "$line"
- done
- exit 1
-}
-
-
-#
-# This script must run from MySQL top directory
-#
-
-if [ ! -f scripts/make_win_src_distribution ]; then
- abort "ERROR : You must run this script from the MySQL top-level directory"
-fi
-SOURCE=`pwd`
-
-#
-# Check for source compilation/configuration
-#
-
-if [ ! -f sql/sql_yacc.cc ]; then
- abort "ERROR : Sorry, you must run this script after the complete build," \
- " hope you know what you are trying to do !!"
-fi
-
-#
-# Debug print of the status
-#
-
-print_debug()
-{
- for statement
- do
- if [ "$DEBUG" = "1" ] ; then
- echo $statement
- fi
- done
-}
-
-#
-# Usage of the script
-#
-
-show_usage()
-{
- echo "MySQL utility script to create a Windows src package, and it takes"
- echo "the following arguments:"
- echo ""
- echo " --debug Debug, without creating the package"
- echo " --tmp Specify the temporary location"
- echo " --suffix Suffix name for the package"
- echo " --dirname Directory name to copy files (intermediate)"
- echo " --silent Show no progress information"
- echo " --tar Create tar.gz package"
- echo " --zip Create zip package"
- echo " --help Show this help message"
-
- exit 0
-}
-
-#
-# Parse the input arguments
-#
-
-parse_arguments() {
- for arg do
- case "$arg" in
- --add-tar) ADDTAR=1 ;;
- --debug) DEBUG=1;;
- --tmp=*) TMP=`echo "$arg" | sed -e "s;--tmp=;;"` ;;
- --suffix=*) SUFFIX=`echo "$arg" | sed -e "s;--suffix=;;"` ;;
- --dirname=*) DIRNAME=`echo "$arg" | sed -e "s;--dirname=;;"` ;;
- --silent) SILENT=1 ;;
- --tar) OUTTAR=1 ;;
- --zip) OUTZIP=1 ;;
- --help) show_usage ;;
- *) abort "Unknown argument '$arg'"
- ;;
- esac
- done
-}
-
-parse_arguments "$@"
-
-#
-# Assign the tmp directory if it was set from the environment variables
-#
-
-for i in $TMP $TMPDIR $TEMPDIR $TEMP /tmp
-do
- if [ "$i" ]; then
- print_debug "Setting TMP to '$i'"
- TMP=$i
- break
- fi
-done
-
-
-#
-# Convert argument file from unix to DOS text
-#
-
-unix_to_dos()
-{
- for arg do
- print_debug "Replacing LF -> CRLF from '$arg'"
-
- awk '{sub(/$/,"\r");print}' < $arg > $arg.tmp
- rm -f $arg
- mv $arg.tmp $arg
- done
-}
-
-
-#
-# Create a tmp dest directory to copy files
-#
-
-BASE=$TMP/my_win_dist$SUFFIX.$$
-trap "rm -r -f $BASE; echo '*** interrupted ***'; exit 1" 1 2 3 13 15
-
-if [ -d $BASE ] ; then
- echo "WARNING: Destination directory '$BASE' already exists, deleting it"
- rm -r -f $BASE
-fi
-
-$CP -r $SOURCE/VC++Files $BASE
-# This includes an implicit 'mkdir $BASE' !
-
-#
-# Process version tags in InstallShield files
-#
-
-vreplace()
-{
- for arg do
- unix_to_dos $arg
- cat $arg | sed -e 's!@''VERSION''@!@VERSION@!' > $arg.tmp
- rm -f $arg
- mv $arg.tmp $arg
- done
-}
-
-if test -d $BASE/InstallShield
-then
- for d in 4.1.XX-gpl 4.1.XX-pro 4.1.XX-classic
- do
- cd $BASE/InstallShield/$d/String\ Tables/0009-English
- vreplace value.shl
- cd ../../Setup\ Files/Compressed\ Files/Language\ Independent/OS\ Independent
- vreplace infolist.txt
- done
-fi
-
-#
-# Move all error message files to root directory
-#
-
-$CP -r $SOURCE/sql/share $BASE/
-rm -r -f "$BASE/share/Makefile"
-rm -r -f "$BASE/share/Makefile.in"
-rm -r -f "$BASE/share/Makefile.am"
-
-mkdir $BASE/Docs $BASE/extra $BASE/include
-
-#
-# Copy directory files
-#
-
-copy_dir_files()
-{
- for arg do
- print_debug "Copying files from directory '$arg'"
- cd $SOURCE/$arg
- if [ ! -d $BASE/$arg ]; then
- print_debug "Creating directory '$arg'"
- mkdir $BASE/$arg
- fi
- for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp *.yy *dsp *.dsw \
- README INSTALL* LICENSE AUTHORS NEWS ChangeLog \
- *.inc *.test *.result *.pem Moscow_leap des_key_file \
- *.vcproj *.sln *.dat *.000001 *.require *.opt *.cnf
- do
- if [ -f $i ]
- then
- $CP $SOURCE/$arg/$i $BASE/$arg/$i
- fi
- done
- for i in *.cc
- do
- if [ -f $i ]
- then
- i=`echo $i | sed 's/.cc$//g'`
- $CP $SOURCE/$arg/$i.cc $BASE/$arg/$i.cpp
- fi
- done
- done
-}
-
-#
-# Copy directory contents recursively
-#
-
-copy_dir_dirs() {
-
- for arg do
-
- cd $SOURCE
- (
- find $arg -type d \
- -and -not -path \*SCCS\* \
- -and -not -path \*.deps\* \
- -and -not -path \*.libs\* \
- -and -not -path \*autom4te.cache -print
- )|(
- while read v
- do
- copy_dir_files $v
- done
- )
-
- done
-}
-
-#
-# Input directories to be copied
-#
-
-for i in client dbug extra heap include \
- libmysql libmysqld myisam \
- myisammrg mysys regex sql strings sql-common sql/examples \
- tools vio zlib
-do
- copy_dir_files $i
-done
-
-#
-# Create project files for ndb
-#
-make -C $SOURCE/ndb windoze || true
-
-#
-# Input directories to be copied recursively
-#
-
-for i in bdb innobase ndb extra/yassl server-tools
-do
- copy_dir_dirs $i
-done
-
-#
-# Create dummy innobase configure header
-#
-
-if [ -f $BASE/innobase/ib_config.h ]; then
- rm -f $BASE/innobase/ib_config.h
-fi
-touch $BASE/innobase/ib_config.h
-
-
-#
-# Copy miscellaneous files
-#
-
-cd $SOURCE
-for i in COPYING ChangeLog README EXCEPTIONS-CLIENT\
- INSTALL-SOURCE INSTALL-WIN \
- INSTALL-WIN-SOURCE \
- Docs/INSTALL-BINARY Docs/manual.chm
-do
- print_debug "Copying file '$i'"
- if [ -f $i ]
- then
- $CP $i $BASE/$i
- fi
-done
-
-#
-# support files
-#
-mkdir $BASE/support-files
-
-# Rename the cnf files to <file>.ini
-for i in support-files/*.cnf
-do
- i=`echo $i | sed 's/.cnf$//g'`
- cp $i.cnf $BASE/$i.ini
-done
-
-#
-# Raw dirs from source tree
-#
-
-for i in scripts sql-bench mysql-test SSL tests
-do
- print_debug "Copying directory '$i'"
- if [ -d $i ]
- then
- if [ -d $BASE/$i ]
- then
- $CP -R $i $BASE
- else
- $CP -R $i $BASE/$i
- fi
- fi
- # But remove object files from destination
- find $BASE/$i -type f -name \*.o | xargs rm -f
-done
-
-#
-# Fix some windows files to avoid compiler warnings
-#
-
-if [ -x extra/replace ] ; then
- ./extra/replace std:: "" < $BASE/sql/sql_yacc.cpp | \
- sed '/^ *switch (yytype)$/ { N; /\n *{$/ { N; /\n *default:$/ { N; /\n *break;$/ { N; /\n *}$/ d; };};};} ' \
- > $BASE/sql/sql_yacc.cpp-new
- mv $BASE/sql/sql_yacc.cpp-new $BASE/sql/sql_yacc.cpp
-else
- if [ "$SILENT" = "0" ] ; then
- echo 'WARNING: "extra/replace" not built, can not filter "sql_yacc.ccp"'
- echo 'WARNING: to reduce the number of warnings when building'
- fi
-fi
-
-#
-# Search the tree for plain text files and adapt the line end marker
-#
-find $BASE \( -name "*.cnf" -o -name "*.ini" \
- -o -name COPYING -o -name ChangeLog -o -name EXCEPTIONS-CLIENT \
- -o -name "INSTALL*" -o -name LICENSE -o -name "README*" \
- -o -name "*.dsp" -o -name "*.dsw" \
- -o -name "*.vcproj" -o -name "*.sln" \) -type f -print \
-| while read v
- do
- unix_to_dos $v
- done
-
-mv $BASE/README $BASE/README.txt
-
-#
-# Clean up if we did this from a bk tree
-#
-
-find $BASE -type d \( -name SCCS -o -name .deps -o -name .libs \) -print0 | \
-xargs -0 rm -r -f
-rm -r -f "$BASE/mysql-test/var"
-
-#
-# Initialize the initial data directory
-#
-
-if [ ! -f scripts/mysql_install_db ] ; then
- if [ "$SILENT" = "0" ] ; then
- echo 'WARNING: "scripts/mysql_install_db" is not built, can not initiate databases'
- fi
-elif [ ! -f extra/my_print_defaults ]; then
- if [ "$SILENT" = "0" ] ; then
- echo 'WARNING: "extra/my_print_defaults" is not built, can not initiate databases'
- fi
-else
- print_debug "Initializing the 'data' directory"
- scripts/mysql_install_db --no-defaults --windows --datadir=$BASE/data
- if test "$?" = 1
- then
- exit 1;
- fi
-fi
-
-#
-# Specify the distribution package name and copy it
-#
-
-if test -z $DIRNAME
-then
- NEW_DIR_NAME=mysql@MYSQL_SERVER_SUFFIX@-$version$SUFFIX
-else
- NEW_DIR_NAME=$DIRNAME
-fi
-NEW_NAME=$NEW_DIR_NAME-win-src
-
-BASE2=$TMP/$NEW_DIR_NAME
-rm -r -f $BASE2
-mv $BASE $BASE2
-BASE=$BASE2
-
-#
-# If debugging, don't create a zip/tar/gz
-#
-
-if [ "$DEBUG" = "1" ] ; then
- echo "Please check the distribution files from $BASE"
- echo "Exiting (without creating the package).."
- exit
-fi
-
-#
-# This is needed to prefere gnu tar instead of tar because tar can't
-# always handle long filenames
-#
-
-PATH_DIRS=`echo $PATH | sed -e 's/^:/. /' -e 's/:$/ ./' -e 's/::/ . /g' -e 's/:/ /g' `
-which_1 ()
-{
- for cmd
- do
- for d in $PATH_DIRS
- do
- for file in $d/$cmd
- do
- if test -x $file -a ! -d $file
- then
- echo $file
- exit 0
- fi
- done
- done
- done
- exit 1
-}
-
-#
-# Create the result zip/tar file
-#
-
-if [ "$OUTTAR" = "0" ]; then
- if [ "$OUTZIP" = "0" ]; then
- OUTZIP=1
- fi
-fi
-
-set_tarzip_options()
-{
- for arg
- do
- if [ "$arg" = "tar" ]; then
- ZIPFILE1=gnutar
- ZIPFILE2=gtar
- OPT=cf
- EXT=".tar"
- NEED_COMPRESS=1
- else
- ZIPFILE1=zip
- ZIPFILE2=""
- OPT="-r -q"
- EXT=".zip"
- NEED_COMPRESS=0
- fi
- done
-}
-
-
-#
-# Create the archive
-#
-create_archive()
-{
-
- print_debug "Using $tar to create archive"
-
- cd $TMP
-
- rm -f $SOURCE/$NEW_NAME$EXT
- $tar $OPT $SOURCE/$NEW_NAME$EXT $NEW_DIR_NAME
- cd $SOURCE
-
- if [ "$NEED_COMPRESS" = "1" ]
- then
- print_debug "Compressing archive"
- gzip -9 $NEW_NAME$EXT
- EXT="$EXT.gz"
- fi
-
- if [ "$SILENT" = "0" ] ; then
- echo "$NEW_NAME$EXT created successfully !!"
- fi
-}
-
-if [ "$OUTTAR" = "1" ]; then
- set_tarzip_options 'tar'
-
- tar=`which_1 $ZIPFILE1 $ZIPFILE2`
- if test "$?" = "1" -o "$tar" = ""
- then
- print_debug "Search failed for '$ZIPFILE1', '$ZIPFILE2', using default 'tar'"
- tar=tar
- set_tarzip_options 'tar'
- fi
-
- create_archive
-fi
-
-if [ "$OUTZIP" = "1" ]; then
- set_tarzip_options 'zip'
-
- tar=`which_1 $ZIPFILE1 $ZIPFILE2`
- if test "$?" = "1" -o "$tar" = ""
- then
- echo "Search failed for '$ZIPFILE1', '$ZIPFILE2', cannot create zip!"
- fi
-
- create_archive
-fi
-
-print_debug "Removing temporary directory"
-rm -r -f $BASE
-
-# No need to report anything if we got here
-trap "" 0
-
-# End of script
diff --git a/scripts/mysql_convert_table_format.sh b/scripts/mysql_convert_table_format.sh
index 0c9ce3a67e0..4df3e293303 100644
--- a/scripts/mysql_convert_table_format.sh
+++ b/scripts/mysql_convert_table_format.sh
@@ -83,7 +83,7 @@ foreach $table (@ARGV)
}
}
print "converting $table\n" if ($opt_verbose);
- if (!$dbh->do("ALTER TABLE $table type=$opt_type"))
+ if (!$dbh->do("ALTER TABLE $table ENGINE=$opt_type"))
{
print STDERR "Can't convert $table: Error $DBI::errstr\n";
exit(1) if (!$opt_force);
@@ -128,7 +128,7 @@ Conversion of a MySQL tables to other table types.
--socket='/path/to/socket'
Socket to connect with.
---type='table-type'
+--ENGINE='table-type'
Converts tables to the given table type (Default: $opt_type)
MySQL 3.23 supports at least the BDB, ISAM and MYISAM types.
diff --git a/scripts/mysql_explain_log.sh b/scripts/mysql_explain_log.sh
deleted file mode 100644
index a549817db5a..00000000000
--- a/scripts/mysql_explain_log.sh
+++ /dev/null
@@ -1,413 +0,0 @@
-#!@PERL@
-# Copyright (C) 2001-2003, 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
-
-use strict;
-use warnings;
-use DBI;
-
-use Getopt::Long;
-$Getopt::Long::ignorecase=0;
-
-my $Param={};
-
-$Param->{host}='';
-$Param->{user}='';
-$Param->{password}='';
-$Param->{PrintError}=0;
-$Param->{socket}='';
-
-my $help;
-
-if (!GetOptions (
- 'date|d:i' => \$Param->{ViewDate},
- 'host|h:s' => \$Param->{host},
- 'user|u:s' => \$Param->{user},
- 'password|p:s' => \$Param->{password},
- 'printerror|e:s' => \$Param->{PrintError},
- 'socket|s:s' => \$Param->{socket},
- 'help|h' => \$help,
- )) {
- ShowOptions();
- exit(0);
-}
-if (defined ($help)) {
- ShowOptions();
- exit(0);
-}
-
- print "explain_log provided by http://www.mobile.de\n";
- print "=========== ================================\n";
-
- $Param->{UpdateCount} = 0;
- $Param->{SelectCount} = 0;
- $Param->{IdxUseCount} = 0;
- $Param->{LineCount} = 0;
-
- $Param->{Init} = 0;
- $Param->{Field} = 0;
- $Param->{Refresh} = 0;
- $Param->{QueryCount} = 0;
- $Param->{Statistics} =0;
-
- $Param->{Query} = undef;
- $Param->{ALL} = undef ;
- $Param->{Comment} = undef ;
-
- @{$Param->{Rows}} = (qw|possible_keys key type|);
-
- if ($Param->{ViewDate}) {
- $Param->{View} = 0;
- }
- else {
- $Param->{View} = 1;
- }
-
- #print "Date=$Param->{ViewDate}, host=$Param->{host}, user=$Param->{user}, password=$Param->{password}\n";
-
- $Param->{dbh}=DBI->connect("DBI:mysql:host=$Param->{host}".($Param->{socket}?";mysql_socket=$Param->{socket}":""),$Param->{user},$Param->{password},{PrintError=>0});
- if (DBI::err()) {
- print "Error: " . DBI::errstr() . "\n";
- }
- else {
- $Param->{Start} = time;
- while(<>) {
- $Param->{LineCount} ++ ;
-
- if ($Param->{ViewDate} ) {
- if (m/^(\d{6})\s+\d{1,2}:\d\d:\d\d\s.*$/) { # get date
- #print "# $1 #\n";
- if ($1 == $Param->{ViewDate}) {
- $Param->{View} = 1;
- }
- else {
- $Param->{View} = 0;
- }
- }
- }
- if ($Param->{View} ) {
- #print "->>>$_";
-
- if (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Connect.+\s+on\s+(.*)$/i) { # get connection ID($2) and database($3)
- #print "C-$1--$2--$3------\n";
- RunQuery($Param);
- if (defined $3) {
- $Param->{CID}->{$2} = $3 ;
- #print "DB:$Param->{CID}->{$2} .. $2 .. $3 \n";
- }
- }
-
- elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Connect.+$/i) { # get connection ID($2) and database($3)
- #print "\n <<<<<<<<<<<<<<<<<<----------------------------<<<<<<<<<<<<<<<< \n";
- #print "Connect \n";
- RunQuery($Param);
- }
- elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Change user .*\s+on\s+(.*)$/i) { # get connection ID($2) and database($3)
- #print "C-$1--$2--$3------\n";
- RunQuery($Param);
- if (defined $3) {
- $Param->{CID}->{$2} = $3 ;
- #print "DB:$Param->{CID}->{$2} .. $2 .. $3 \n";
- }
- }
-
- elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Quit\s+$/i) { # remove connection ID($2) and querystring
- #print "Q-$1--$2--------\n";
- RunQuery($Param);
- delete $Param->{CID}->{$2} ;
- }
-
- elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Query\s+(select.+)$/i) { # get connection ID($2) and querystring
- #print "S1-$1--$2--$3------\n";
- RunQuery($Param);
- unless ($Param->{CID}->{$2}) {
- #print "Error: No Database for Handle: $2 found\n";
- }
- else {
- $Param->{DB}=$Param->{CID}->{$2};
-
- my $s = "$3";
- $s =~ s/from\s/from $Param->{DB}./i;
- $Param->{Query}="EXPLAIN $s";
-
- #$s =~ m/from\s+(\w+[.]\w+)/i;
- #$Param->{tab} =$1;
- #print "-- $Param->{tab} -- $s --\n";
- }
- }
-
- elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Query\s+(update.+)$/i) { # get connection ID($2) and querystring
- #print "S2--$1--$2--$3------\n";
- RunQuery($Param);
- unless ($Param->{CID}->{$2}) {
- #print "Error: No Database for Handle: $2 found\n";
- }
- else {
- $Param->{DB}=$Param->{CID}->{$2};
-
- my $ud = $3;
- $ud =~ m/^update\s+(\w+).+(where.+)$/i;
- $Param->{Query} ="EXPLAIN SELECT * FROM $1 $2";
- $Param->{Query} =~ s/from\s/from $Param->{DB}./i;
-
- #$Param->{Query} =~ m/from\s+(\w+[.]\w+)/i;
- #$Param->{tab} =$1;
- }
- }
-
- elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Statistics\s+(.*)$/i) { # get connection ID($2) and info?
- $Param->{Statistics} ++;
- #print "Statistics--$1--$2--$3------\n";
- RunQuery($Param);
- }
- elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Query\s+(.+)$/i) { # get connection ID($2)
- $Param->{QueryCount} ++;
- #print "Query-NULL $3\n";
- RunQuery($Param);
- }
- elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Refresh\s+(.+)$/i) { # get connection ID($2)
- $Param->{Refresh} ++;
- #print "Refresh\n";
- RunQuery($Param);
- }
- elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Init\s+(.+)$/i) { # get connection ID($2)
- $Param->{Init} ++;
- #print "Init $3\n";
- RunQuery($Param);
- }
- elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Field\s+(.+)$/i) { # get connection ID($2)
- $Param->{Field} ++;
- #print "Field $3\n";
- RunQuery($Param);
- }
-
- elsif (m/^\s+(.+)$/ ) { # command could be some lines ...
- #print "multi-lined ($1)\n";
- my ($A)=$1;
- chomp $A;
- $Param->{Query} .= " $1";
- #print "multi-lined ($1)<<$Param->{Query}>>\n";
- }
-
-
- }
-
- }
-
- $Param->{dbh}->disconnect();
-
- if (1 == 0) {
- print "\nunclosed handles----------------------------------------\n";
- my $count=0;
- foreach (sort keys %{$Param->{CID}}) {
- print "$count | $_ : $Param->{CID}->{$_} \n";
- $count ++;
- }
- }
-
- print "\nIndex usage ------------------------------------\n";
- foreach my $t (sort keys %{$Param->{Data}}) {
- print "\nTable\t$t: ---\n";
- foreach my $k (sort keys %{$Param->{Data}->{$t}}) {
- print " count\t$k:\n";
- my %h = %{$Param->{Data}->{$t}->{$k}};
- foreach (sort {$h{$a} <=> $h{$b}} keys %h) {
- print " $Param->{Data}->{$t}->{$k}->{$_}\t$_\n";
- }
- }
- }
-
- $Param->{AllCount}=0;
- print "\nQueries causing table scans -------------------\n\n";
- foreach (@{$Param->{ALL}}) {
- $Param->{AllCount} ++;
- print "$_\n";
- }
- print "Sum: $Param->{AllCount} table scans\n";
-
- print "\nSummary ---------------------------------------\n\n";
- print "Select: \t$Param->{SelectCount} queries\n";
- print "Update: \t$Param->{UpdateCount} queries\n";
- print "\n";
-
- print "Init: \t$Param->{Init} times\n";
- print "Field: \t$Param->{Field} times\n";
- print "Refresh: \t$Param->{Refresh} times\n";
- print "Query: \t$Param->{QueryCount} times\n";
- print "Statistics:\t$Param->{Statistics} times\n";
- print "\n";
-
- print "Logfile: \t$Param->{LineCount} lines\n";
- print "Started: \t".localtime($Param->{Start})."\n";
- print "Finished: \t".localtime(time)."\n";
-
- }
-
-
-###########################################################################
-#
-#
-#
-sub RunQuery {
- my $Param = shift ;
-
- if (defined $Param->{Query}) {
- if (defined $Param->{DB} ) {
-
- $Param->{Query} =~ m/from\s+(\w+[.]\w+|\w+)/i;
- $Param->{tab} =$1;
- #print "||$Param->{tab} -- $Param->{Query}\n";
-
- my $sth=$Param->{dbh}->prepare("USE $Param->{DB}");
- if (DBI::err()) {
- if ($Param->{PrintError}) {print "Error: ".DBI::errstr()."\n";}
- }
- else {
- $sth->execute();
- if (DBI::err()) {
- if ($Param->{PrintError}) {print "Error: ".DBI::errstr()."\n";}
- }
- else {
- $sth->finish();
-
- $sth=$Param->{dbh}->prepare($Param->{Query});
- if (DBI::err()) {
- if ($Param->{PrintError}) {print "Error: ".DBI::errstr()."\n";}
- }
- else {
- #print "$Param->{Query}\n";
- $sth->execute();
- if (DBI::err()) {
- if ($Param->{PrintError}) {print "[$Param->{LineCount}]<<$Param->{Query}>>\n";}
- if ($Param->{PrintError}) {print "Error: ".DBI::errstr()."\n";}
- }
- else {
- my $row = undef;
- while ($row = $sth->fetchrow_hashref()) {
- $Param->{SelectCount} ++;
-
- if (defined $row->{Comment}) {
- push (@{$Param->{Comment}}, "$row->{Comment}; $_; $Param->{DB}; $Param->{Query}");
- }
- foreach (@{$Param->{Rows}}) {
- if (defined $row->{$_}) {
- #if (($_ eq 'type' ) and ($row->{$_} eq 'ALL')) {
- if ($row->{type} eq 'ALL') {
- push (@{$Param->{ALL}}, "$Param->{Query}");
- #print ">> $row->{$_} $_ $Param->{DB} $Param->{Query}\n";
- }
- $Param->{IdxUseCount} ++;
- $Param->{Data}->{$Param->{tab}}->{$_}->{$row->{$_}} ++;
- }
- }
- }
- }
- }
- }
- }
- $sth->finish();
- }
- $Param->{Query} = undef ;
- }
-}
-
-###########################################################################
-#
-#
-#
-sub ShowOptions {
- print <<EOF;
-Usage: $0 [OPTIONS] < LOGFILE
-
---help, -h
- Display this help message
---date=YYMMDD, -d=YYMMDD
- Select entries from the log only for the given date
---host=HOSTNAME, -h=HOSTNAME
- Connect to the MySQL server on the given host
---user=USERNAME, -u=USERNAME
- The MySQL username to use when connecting to the server
---password=PASSWORD, -p=PASSWORD
- The password to use when connecting to the server
---socket=SOCKET, -s=SOCKET
- The socket file to use when connecting to the server
---printerror=1, -e 1
- Enable error output
-
-mysql_explain_log reads its standard input for query log contents. It
-uses EXPLAIN to analyze SELECT statements found in the input. UPDATE
-statements are rewritten to SELECT statements and also analyzed with
-EXPLAIN. mysql_explain_log then displays a summary of its results.
-Results are printed to the standard output.
-EOF
-}
-
-1;
-
-__END__
-
-=pod
-
-=head1 NAME
-
-mysql_explain_log
-
-Feed a mysqld general query logfile (created with mysqld --log) back
-into mysql and collect statistics about index usage with EXPLAIN.
-
-=head1 DISCUSSION
-
-To optimize your indexes, you must know which ones are actually used
-and what kind of queries are causing table scans. This may not be easy,
-especially if you are generating your queries dynamically and you have
-a huge number of queries being executed.
-
-Use this tool to take a look at the effects of your real life queries.
-Then add indexes to avoid table scans and remove indexes that aren't used.
-
-=head1 USAGE
-
-mysql_explain_log [--date=YYMMDD] --host=dbhost] [--user=dbuser] [--password=dbpw] [--socket=/path/to/socket] [--printerror=1] < logfile
-
---help, -h
- Display this help message
---date=YYMMDD, -d=YYMMDD
- Select entries from the log only for the given date
---host=HOSTNAME, -h=HOSTNAME
- Connect to the MySQL server on the given host
---user=USERNAME, -u=USERNAME
- The MySQL username to use when connecting to the server
---password=PASSWORD, -p=PASSWORD
- The password to use when connecting to the server
---socket=SOCKET, -s=SOCKET
- The socket file to use when connecting to the server
---printerror=1, -e 1
- Enable error output
-
-=head1 EXAMPLE
-
-mysql_explain_log --host=localhost --user=foo --password=bar < /var/lib/mysql/mobile.log
-
-=head1 AUTHORS
-
- Stefan Nitz
- Jan Willamowius <jan@willamowius.de>, http://www.willamowius.de
- Dennis Haney <davh@davh.dk> (Added socket support)
-
-=head1 SEE ALSO
-
-mysql documentation
-
-=cut
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 934d245db15..e848c5e3c96 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -275,7 +275,7 @@ fi
mysqld_bootstrap="${MYSQLD_BOOTSTRAP-$mysqld}"
mysqld_install_cmd_line="$mysqld_bootstrap $defaults $mysqld_opt --bootstrap \
--basedir=$basedir --datadir=$ldata --skip-innodb \
---skip-bdb --skip-ndbcluster $args --max_allowed_packet=8M \
+--skip-ndbcluster $args --max_allowed_packet=8M \
--net_buffer_length=16K"
# Pipe mysql_system_tables.sql to "mysqld --bootstrap"
diff --git a/scripts/mysql_prepare_privilege_tables_for_5.sql b/scripts/mysql_prepare_privilege_tables_for_5.sql
deleted file mode 100644
index a9b6d43aee0..00000000000
--- a/scripts/mysql_prepare_privilege_tables_for_5.sql
+++ /dev/null
@@ -1,53 +0,0 @@
-
-use mysql;
-
---
--- merging `host` table and `db`
---
-
-UPDATE IGNORE host SET Host='%' WHERE Host='';
-DELETE FROM host WHERE Host='';
-
-INSERT IGNORE INTO db (User, Host, Select_priv, Insert_priv, Update_priv,
- Delete_priv, Create_priv, Drop_priv, Grant_priv, References_priv,
- Index_priv, Alter_priv, Create_tmp_table_priv, Lock_tables_priv)
- SELECT d.User, h.Host,
- (d.Select_priv = 'Y' || h.Select_priv = 'Y') + 1,
- (d.Insert_priv = 'Y' || h.Select_priv = 'Y') + 1,
- (d.Update_priv = 'Y' || h.Update_priv = 'Y') + 1,
- (d.Delete_priv = 'Y' || h.Delete_priv = 'Y') + 1,
- (d.Create_priv = 'Y' || h.Create_priv = 'Y') + 1,
- (d.Drop_priv = 'Y' || h.Drop_priv = 'Y') + 1,
- (d.Grant_priv = 'Y' || h.Grant_priv = 'Y') + 1,
- (d.References_priv = 'Y' || h.References_priv = 'Y') + 1,
- (d.Index_priv = 'Y' || h.Index_priv = 'Y') + 1,
- (d.Alter_priv = 'Y' || h.Alter_priv = 'Y') + 1,
- (d.Create_tmp_table_priv = 'Y' || h.Create_tmp_table_priv = 'Y') + 1,
- (d.Lock_tables_priv = 'Y' || h.Lock_tables_priv = 'Y') + 1
- FROM db d, host h WHERE d.Host = '';
-
-UPDATE IGNORE db SET Host='%' WHERE Host = '';
-DELETE FROM db WHERE Host='';
-
-TRUNCATE TABLE host;
-
---
--- Adding missing users to `user` table
---
--- note that invalid password causes the user to be skipped during the
--- load of grand tables (at mysqld startup) thus three following inserts
--- do not affect anything
-
-INSERT IGNORE user (User, Host, Password) SELECT User, Host, "*" FROM db;
-INSERT IGNORE user (User, Host, Password) SELECT User, Host, "*" FROM tables_priv;
-INSERT IGNORE user (User, Host, Password) SELECT User, Host, "*" FROM columns_priv;
-
-SELECT DISTINCT
-"There are user accounts with the username 'PUBLIC'. In the SQL-1999
-(or later) standard this name is reserved for PUBLIC role and can
-not be used as a valid user name. Consider renaming these accounts before
-upgrading to MySQL-5.0.
-These accounts are:" x
-FROM user WHERE user='PUBLIC';
-SELECT CONCAT(user,'@',host) FROM user WHERE user='PUBLIC';
-
diff --git a/scripts/mysql_system_tables.sql b/scripts/mysql_system_tables.sql
index d9c870f1d73..c779d174d12 100644
--- a/scripts/mysql_system_tables.sql
+++ b/scripts/mysql_system_tables.sql
@@ -4,15 +4,15 @@
set storage_engine=myisam;
-CREATE TABLE IF NOT EXISTS db ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Delete_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Drop_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Grant_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, References_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Index_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, PRIMARY KEY Host (Host,Db,User), KEY User (User) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Database privileges';
+CREATE TABLE IF NOT EXISTS db ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Delete_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Drop_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Grant_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, References_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Index_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Event_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Trigger_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, PRIMARY KEY Host (Host,Db,User), KEY User (User) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Database privileges';
-- Remember for later if db table already existed
set @had_db_table= @@warning_count != 0;
-CREATE TABLE IF NOT EXISTS host ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Delete_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Drop_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Grant_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, References_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Index_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, PRIMARY KEY Host (Host,Db) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Host privileges; Merged with database privileges';
+CREATE TABLE IF NOT EXISTS host ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Delete_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Drop_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Grant_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, References_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Index_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Trigger_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, PRIMARY KEY Host (Host,Db) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Host privileges; Merged with database privileges';
-CREATE TABLE IF NOT EXISTS user ( Host char(60) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL, Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Delete_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Drop_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Reload_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Shutdown_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Process_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, File_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Grant_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, References_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Index_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Show_db_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Super_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Repl_slave_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Repl_client_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_user_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, ssl_type enum('','ANY','X509', 'SPECIFIED') COLLATE utf8_general_ci DEFAULT '' NOT NULL, ssl_cipher BLOB NOT NULL, x509_issuer BLOB NOT NULL, x509_subject BLOB NOT NULL, max_questions int(11) unsigned DEFAULT 0 NOT NULL, max_updates int(11) unsigned DEFAULT 0 NOT NULL, max_connections int(11) unsigned DEFAULT 0 NOT NULL, max_user_connections int(11) unsigned DEFAULT 0 NOT NULL, PRIMARY KEY Host (Host,User) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Users and global privileges';
+CREATE TABLE IF NOT EXISTS user ( Host char(60) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL, Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Delete_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Drop_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Reload_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Shutdown_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Process_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, File_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Grant_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, References_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Index_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Show_db_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Super_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Repl_slave_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Repl_client_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_user_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Event_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Trigger_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, ssl_type enum('','ANY','X509', 'SPECIFIED') COLLATE utf8_general_ci DEFAULT '' NOT NULL, ssl_cipher BLOB NOT NULL, x509_issuer BLOB NOT NULL, x509_subject BLOB NOT NULL, max_questions int(11) unsigned DEFAULT 0 NOT NULL, max_updates int(11) unsigned DEFAULT 0 NOT NULL, max_connections int(11) unsigned DEFAULT 0 NOT NULL, max_user_connections int(11) unsigned DEFAULT 0 NOT NULL, PRIMARY KEY Host (Host,User) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Users and global privileges';
-- Remember for later if user table already existed
set @had_user_table= @@warning_count != 0;
@@ -21,7 +21,13 @@ set @had_user_table= @@warning_count != 0;
CREATE TABLE IF NOT EXISTS func ( name char(64) binary DEFAULT '' NOT NULL, ret tinyint(1) DEFAULT '0' NOT NULL, dl char(128) DEFAULT '' NOT NULL, type enum ('function','aggregate') COLLATE utf8_general_ci NOT NULL, PRIMARY KEY (name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='User defined functions';
-CREATE TABLE IF NOT EXISTS tables_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Timestamp timestamp(14), Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name), KEY Grantor (Grantor) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Table privileges';
+CREATE TABLE IF NOT EXISTS plugin ( name char(64) binary DEFAULT '' NOT NULL, dl char(128) DEFAULT '' NOT NULL, PRIMARY KEY (name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='MySQL plugins';
+
+
+CREATE TABLE IF NOT EXISTS servers ( Server_name char(64) NOT NULL DEFAULT '', Host char(64) NOT NULL DEFAULT '', Db char(64) NOT NULL DEFAULT '', Username char(64) NOT NULL DEFAULT '', Password char(64) NOT NULL DEFAULT '', Port INT(4) NOT NULL DEFAULT '0', Socket char(64) NOT NULL DEFAULT '', Wrapper char(64) NOT NULL DEFAULT '', Owner char(64) NOT NULL DEFAULT '', PRIMARY KEY (Server_name)) CHARACTER SET utf8 comment='MySQL Foreign Servers table';
+
+
+CREATE TABLE IF NOT EXISTS tables_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Timestamp timestamp(14), Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name), KEY Grantor (Grantor) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Table privileges';
CREATE TABLE IF NOT EXISTS columns_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Column_name char(64) binary DEFAULT '' NOT NULL, Timestamp timestamp(14), Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name,Column_name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Column privileges';
@@ -58,3 +64,19 @@ CREATE TABLE IF NOT EXISTS proc ( db char(64) collate utf8_bin DEFAULT '' NOT NU
CREATE TABLE IF NOT EXISTS procs_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Routine_name char(64) binary DEFAULT '' NOT NULL, Routine_type enum('FUNCTION','PROCEDURE') NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Proc_priv set('Execute','Alter Routine','Grant') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Timestamp timestamp(14), PRIMARY KEY (Host,Db,User,Routine_name,Routine_type), KEY Grantor (Grantor) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Procedure privileges';
+
+delimiter ;;
+CREATE PROCEDURE create_general_log_table() BEGIN DECLARE is_csv_enabled int DEFAULT 0; SELECT @@have_csv = 'YES' INTO is_csv_enabled; IF (is_csv_enabled) THEN CREATE TABLE IF NOT EXISTS general_log (event_time TIMESTAMP NOT NULL, user_host MEDIUMTEXT, thread_id INTEGER, server_id INTEGER, command_type VARCHAR(64), argument MEDIUMTEXT) engine=CSV CHARACTER SET utf8 comment='General log'; END IF; END;;
+CALL create_general_log_table();;
+DROP PROCEDURE create_general_log_table;;
+
+CREATE PROCEDURE create_slow_log_table() BEGIN DECLARE is_csv_enabled int DEFAULT 0; SELECT @@have_csv = 'YES' INTO is_csv_enabled; IF (is_csv_enabled) THEN CREATE TABLE IF NOT EXISTS slow_log (start_time TIMESTAMP NOT NULL, user_host MEDIUMTEXT NOT NULL, query_time TIME NOT NULL, lock_time TIME NOT NULL, rows_sent INTEGER NOT NULL, rows_examined INTEGER NOT NULL, db VARCHAR(512), last_insert_id INTEGER, insert_id INTEGER, server_id INTEGER, sql_text MEDIUMTEXT NOT NULL) engine=CSV CHARACTER SET utf8 comment='Slow log'; END IF; END;;
+CALL create_slow_log_table();;
+DROP PROCEDURE create_slow_log_table;;
+delimiter ;
+
+CREATE TABLE IF NOT EXISTS event ( db char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', name char(64) CHARACTER SET utf8 NOT NULL default '', body longblob NOT NULL, definer char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', execute_at DATETIME default NULL, interval_value int(11) default NULL, interval_field ENUM('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND') default NULL, created TIMESTAMP NOT NULL, modified TIMESTAMP NOT NULL, last_executed DATETIME default NULL, starts DATETIME default NULL, ends DATETIME default NULL, status ENUM('ENABLED','DISABLED','SLAVESIDE_DISABLED') NOT NULL default 'ENABLED', on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP', sql_mode set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE') DEFAULT '' NOT NULL, comment char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', originator int(10) NOT NULL, time_zone char(64) CHARACTER SET latin1 NOT NULL DEFAULT 'SYSTEM', PRIMARY KEY (db, name) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';
+
+
+CREATE TABLE IF NOT EXISTS ndb_binlog_index (Position BIGINT UNSIGNED NOT NULL, File VARCHAR(255) NOT NULL, epoch BIGINT UNSIGNED NOT NULL, inserts BIGINT UNSIGNED NOT NULL, updates BIGINT UNSIGNED NOT NULL, deletes BIGINT UNSIGNED NOT NULL, schemaops BIGINT UNSIGNED NOT NULL, PRIMARY KEY(epoch)) ENGINE=MYISAM;
+
diff --git a/scripts/mysql_system_tables_data.sql b/scripts/mysql_system_tables_data.sql
index 5f0289ab197..07aa932cda2 100644
--- a/scripts/mysql_system_tables_data.sql
+++ b/scripts/mysql_system_tables_data.sql
@@ -5,8 +5,8 @@
-- Fill "db" table with default grants for anyone to
-- access database 'test' and 'test_%' if "db" table didn't exist
CREATE TEMPORARY TABLE tmp_db LIKE db;
-INSERT INTO tmp_db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N');
-INSERT INTO tmp_db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N');
+INSERT INTO tmp_db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
+INSERT INTO tmp_db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
DROP TABLE tmp_db;
@@ -14,8 +14,8 @@ DROP TABLE tmp_db;
-- Fill "users" table with default users allowing root access
-- from local machine if "users" table didn't exist before
CREATE TEMPORARY TABLE tmp_user LIKE user;
-INSERT INTO tmp_user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
-REPLACE INTO tmp_user VALUES (@@hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
-REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
+INSERT INTO tmp_user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
+REPLACE INTO tmp_user VALUES (@@hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
+REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
DROP TABLE tmp_user;
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql
index 205bc93efea..6fbf20a2c9f 100644
--- a/scripts/mysql_system_tables_fix.sql
+++ b/scripts/mysql_system_tables_fix.sql
@@ -9,6 +9,7 @@
# this sql script.
# On windows you should do 'mysql --force mysql < mysql_fix_privilege_tables.sql'
+set sql_mode='';
set storage_engine=MyISAM;
ALTER TABLE user add File_priv enum('N','Y') COLLATE utf8_general_ci NOT NULL;
@@ -40,7 +41,6 @@ ALTER TABLE user MODIFY ssl_type enum('','ANY','X509', 'SPECIFIED') NOT NULL;
#
# tables_priv
#
-
ALTER TABLE tables_priv
ADD KEY Grantor (Grantor);
@@ -65,8 +65,9 @@ ALTER TABLE tables_priv
#
# columns_priv
#
-
+#
# Name change of Type -> Column_priv from MySQL 3.22.12
+#
ALTER TABLE columns_priv
CHANGE Type Column_priv set('Select','Insert','Update','References')
COLLATE utf8_general_ci DEFAULT '' NOT NULL;
@@ -130,8 +131,8 @@ ALTER TABLE db
ADD Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
ADD Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL;
ALTER TABLE host
-ADD Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
-ADD Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL;
+ADD Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL,
+ADD Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL;
alter table user change max_questions max_questions int(11) unsigned DEFAULT 0 NOT NULL;
@@ -342,7 +343,7 @@ ALTER TABLE proc MODIFY name char(64) DEFAULT '' NOT NULL,
'READS_SQL_DATA',
'MODIFIES_SQL_DATA'
) DEFAULT 'CONTAINS_SQL' NOT NULL,
- MODIFY body longblob DEFAULT '' NOT NULL,
+ MODIFY body longblob NOT NULL,
MODIFY sql_mode
set('REAL_AS_FLOAT',
'PIPES_AS_CONCAT',
@@ -387,6 +388,84 @@ ALTER TABLE proc MODIFY db
MODIFY comment
char(64) collate utf8_bin DEFAULT '' NOT NULL;
+#
+# EVENT privilege
+#
+SET @hadEventPriv := 0;
+SELECT @hadEventPriv :=1 FROM user WHERE Event_priv LIKE '%';
+
+ALTER TABLE user add Event_priv enum('N','Y') character set utf8 DEFAULT 'N' NOT NULL AFTER Create_user_priv;
+ALTER TABLE user MODIFY Event_priv enum('N','Y') character set utf8 DEFAULT 'N' NOT NULL AFTER Create_user_priv;
+
+UPDATE user SET Event_priv=Super_priv WHERE @hadEventPriv = 0;
+
+ALTER TABLE db add Event_priv enum('N','Y') character set utf8 DEFAULT 'N' NOT NULL;
+ALTER TABLE db MODIFY Event_priv enum('N','Y') character set utf8 DEFAULT 'N' NOT NULL;
+
+#
+# EVENT table
+#
+ALTER TABLE event DROP PRIMARY KEY;
+ALTER TABLE event ADD PRIMARY KEY(db, name);
+ALTER TABLE event ADD sql_mode
+ set('REAL_AS_FLOAT',
+ 'PIPES_AS_CONCAT',
+ 'ANSI_QUOTES',
+ 'IGNORE_SPACE',
+ 'NOT_USED',
+ 'ONLY_FULL_GROUP_BY',
+ 'NO_UNSIGNED_SUBTRACTION',
+ 'NO_DIR_IN_CREATE',
+ 'POSTGRESQL',
+ 'ORACLE',
+ 'MSSQL',
+ 'DB2',
+ 'MAXDB',
+ 'NO_KEY_OPTIONS',
+ 'NO_TABLE_OPTIONS',
+ 'NO_FIELD_OPTIONS',
+ 'MYSQL323',
+ 'MYSQL40',
+ 'ANSI',
+ 'NO_AUTO_VALUE_ON_ZERO',
+ 'NO_BACKSLASH_ESCAPES',
+ 'STRICT_TRANS_TABLES',
+ 'STRICT_ALL_TABLES',
+ 'NO_ZERO_IN_DATE',
+ 'NO_ZERO_DATE',
+ 'INVALID_DATES',
+ 'ERROR_FOR_DIVISION_BY_ZERO',
+ 'TRADITIONAL',
+ 'NO_AUTO_CREATE_USER',
+ 'HIGH_NOT_PRECEDENCE'
+ ) DEFAULT '' NOT NULL AFTER on_completion;
+ALTER TABLE event MODIFY name char(64) CHARACTER SET utf8 NOT NULL default '';
+ALTER TABLE event ADD COLUMN originator INT(10) NOT NULL;
+ALTER TABLE event MODIFY COLUMN status ENUM('ENABLED','DISABLED','SLAVESIDE_DISABLED') NOT NULL default 'ENABLED';
+
+ALTER TABLE event ADD COLUMN time_zone char(64) CHARACTER SET latin1
+ NOT NULL DEFAULT 'SYSTEM' AFTER originator;
+
+#
+# TRIGGER privilege
+#
+
+SET @hadTriggerPriv := 0;
+SELECT @hadTriggerPriv :=1 FROM user WHERE Trigger_priv LIKE '%';
+
+ALTER TABLE user ADD Trigger_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL AFTER Event_priv;
+ALTER TABLE user MODIFY Trigger_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL AFTER Event_priv;
+
+ALTER TABLE host ADD Trigger_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL;
+ALTER TABLE host MODIFY Trigger_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL;
+
+ALTER TABLE db ADD Trigger_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL;
+ALTER TABLE db MODIFY Trigger_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL;
+
+ALTER TABLE tables_priv MODIFY Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger') COLLATE utf8_general_ci DEFAULT '' NOT NULL;
+
+UPDATE user SET Trigger_priv=Super_priv WHERE @hadTriggerPriv = 0;
+
# Activate the new, possible modified privilege tables
# This should not be needed, but gives us some extra testing that the above
# changes was correct
diff --git a/scripts/mysql_tableinfo.sh b/scripts/mysql_tableinfo.sh
deleted file mode 100644
index 2ed7e381fa3..00000000000
--- a/scripts/mysql_tableinfo.sh
+++ /dev/null
@@ -1,494 +0,0 @@
-#!@PERL@ -w
-
-use strict;
-use Getopt::Long;
-use DBI;
-
-=head1 NAME
-
-WARNING: MySQL versions 5.0 and above feature the INFORMATION_SCHEMA
-pseudo-database which contains always up-to-date metadata information
-about all tables. So instead of using this script one can now
-simply query the INFORMATION_SCHEMA.SCHEMATA, INFORMATION_SCHEMA.TABLES,
-INFORMATION_SCHEMA.COLUMNS, INFORMATION_SCHEMA.STATISTICS pseudo-tables.
-Please see the MySQL manual for more information about INFORMATION_SCHEMA.
-This script will be removed from the MySQL distribution in version 5.1.
-
-mysql_tableinfo - creates and populates information tables with
-the output of SHOW DATABASES, SHOW TABLES (or SHOW TABLE STATUS),
-SHOW COLUMNS and SHOW INDEX.
-
-This is version 1.1.
-
-=head1 SYNOPSIS
-
- mysql_tableinfo [OPTIONS] database_to_write [database_like_wild] [table_like_wild]
-
- Do not backquote (``) database_to_write,
- and do not quote ('') database_like_wild or table_like_wild
-
- Examples:
-
- mysql_tableinfo info
-
- mysql_tableinfo info this_db
-
- mysql_tableinfo info %a% b%
-
- mysql_tableinfo info --clear-only
-
- mysql_tableinfo info --col --idx --table-status
-
-=cut
-
-# Documentation continued at end of file
-
-
-sub usage {
- die @_,"\nExecute 'perldoc $0' for documentation\n";
-}
-
-my %opt = (
- 'user' => scalar getpwuid($>),
- 'host' => "localhost",
- 'prefix' => "", #to avoid 'use of uninitialized value...'
-);
-Getopt::Long::Configure(qw(no_ignore_case)); # disambuguate -p and -P
-GetOptions( \%opt,
- "help",
- "user|u=s",
- "password|p=s",
- "host|h=s",
- "port|P=s",
- "socket|S=s",
- "tbl-status",
- "col",
- "idx",
- "clear",
- "clear-only",
- "prefix=s",
- "quiet|q",
-) or usage("Invalid option");
-
-if (!$opt{'quiet'})
- {
- print <<EOF
-WARNING: MySQL versions 5.0 and above feature the INFORMATION_SCHEMA
-pseudo-database which contains always up-to-date metadata information
-about all tables. So instead of using this script one can now
-simply query the INFORMATION_SCHEMA.SCHEMATA, INFORMATION_SCHEMA.TABLES,
-INFORMATION_SCHEMA.COLUMNS, INFORMATION_SCHEMA.STATISTICS pseudo-tables.
-Please see the MySQL manual for more information about INFORMATION_SCHEMA.
-This script will be removed from the MySQL distribution in version 5.1.
-EOF
- }
-
-if ($opt{'help'}) {usage();}
-
-my ($db_to_write,$db_like_wild,$tbl_like_wild);
-if (@ARGV==0)
-{
- usage("Not enough arguments");
-}
-$db_to_write="`$ARGV[0]`"; shift @ARGV;
-$db_like_wild=($ARGV[0])?$ARGV[0]:"%"; shift @ARGV;
-$tbl_like_wild=($ARGV[0])?$ARGV[0]:"%"; shift @ARGV;
-if (@ARGV>0) { usage("Too many arguments"); }
-
-$0 = $1 if $0 =~ m:/([^/]+)$:;
-
-my $info_db="`".$opt{'prefix'}."db`";
-my $info_tbl="`".$opt{'prefix'}."tbl".
- (($opt{'tbl-status'})?"_status":"")."`";
-my $info_col="`".$opt{'prefix'}."col`";
-my $info_idx="`".$opt{'prefix'}."idx`";
-
-
-# --- connect to the database ---
-
-my $dsn = ";host=$opt{'host'}";
-$dsn .= ";port=$opt{'port'}" if $opt{'port'};
-$dsn .= ";mysql_socket=$opt{'socket'}" if $opt{'socket'};
-
-my $dbh = DBI->connect("dbi:mysql:$dsn;mysql_read_default_group=perl",
- $opt{'user'}, $opt{'password'},
-{
- RaiseError => 1,
- PrintError => 0,
- AutoCommit => 1,
-});
-
-$db_like_wild=$dbh->quote($db_like_wild);
-$tbl_like_wild=$dbh->quote($tbl_like_wild);
-
-#Ask
-
-if (!$opt{'quiet'})
-{
- print "\n!! This program is going to do:\n\n";
- print "**DROP** TABLE ...\n" if ($opt{'clear'} or $opt{'clear-only'});
- print "**DELETE** FROM ... WHERE `Database` LIKE $db_like_wild AND `Table` LIKE $tbl_like_wild
-**INSERT** INTO ...
-
-on the following tables :\n";
-
- foreach (($info_db, $info_tbl),
- (($opt{'col'})?$info_col:()),
- (($opt{'idx'})?$info_idx:()))
- {
- print(" $db_to_write.$_\n");
- }
- print "\nContinue (you can skip this confirmation step with --quiet) ? (y|n) [n]";
- if (<STDIN> !~ /^\s*y\s*$/i)
- {
- print "Nothing done!\n";exit;
- }
-}
-
-if ($opt{'clear'} or $opt{'clear-only'})
-{
-#do not drop the $db_to_write database !
- foreach (($info_db, $info_tbl),
- (($opt{'col'})?$info_col:()),
- (($opt{'idx'})?$info_idx:()))
- {
- $dbh->do("DROP TABLE IF EXISTS $db_to_write.$_");
- }
- if ($opt{'clear-only'})
- {
- print "Wrote to database $db_to_write .\n" unless ($opt{'quiet'});
- exit;
- }
-}
-
-
-my %sth;
-my %extra_col_desc;
-my %row;
-my %done_create_table;
-
-#create the $db_to_write database
-$dbh->do("CREATE DATABASE IF NOT EXISTS $db_to_write");
-$dbh->do("USE $db_to_write");
-
-#get databases
-$sth{'db'}=$dbh->prepare("SHOW DATABASES LIKE $db_like_wild");
-$sth{'db'}->execute;
-
-#create $info_db which will receive info about databases.
-#Ensure that the first column to be called "Database" (as SHOW DATABASES LIKE
-#returns a varying
-#column name (of the form "Database (%...)") which is not suitable)
-$extra_col_desc{'db'}=do_create_table("db",$info_db,undef,"`Database`");
-#we'll remember the type of the `Database` column (as returned by
-#SHOW DATABASES), which we will need when creating the next tables.
-
-#clear out-of-date info from this table
-$dbh->do("DELETE FROM $info_db WHERE `Database` LIKE $db_like_wild");
-
-
-while ($row{'db'}=$sth{'db'}->fetchrow_arrayref) #go through all databases
-{
-
-#insert the database name
- $dbh->do("INSERT INTO $info_db VALUES("
- .join(',' , ( map $dbh->quote($_), @{$row{'db'}} ) ).")" );
-
-#for each database, get tables
-
- $sth{'tbl'}=$dbh->prepare("SHOW TABLE"
- .( ($opt{'tbl-status'}) ?
- " STATUS"
- : "S" )
- ." from `$row{'db'}->[0]` LIKE $tbl_like_wild");
- $sth{'tbl'}->execute;
- unless ($done_create_table{$info_tbl})
-
-#tables must be created only once, and out-of-date info must be
-#cleared once
- {
- $done_create_table{$info_tbl}=1;
- $extra_col_desc{'tbl'}=
- do_create_table("tbl",$info_tbl,
-#add an extra column (database name) at the left
-#and ensure that the table name will be called "Table"
-#(this is unncessesary with
-#SHOW TABLE STATUS, but necessary with SHOW TABLES (which returns a column
-#named "Tables_in_..."))
- "`Database` ".$extra_col_desc{'db'},"`Table`");
- $dbh->do("DELETE FROM $info_tbl WHERE `Database` LIKE $db_like_wild AND `Table` LIKE $tbl_like_wild");
- }
-
- while ($row{'tbl'}=$sth{'tbl'}->fetchrow_arrayref)
- {
- $dbh->do("INSERT INTO $info_tbl VALUES("
- .$dbh->quote($row{'db'}->[0]).","
- .join(',' , ( map $dbh->quote($_), @{$row{'tbl'}} ) ).")");
-
-#for each table, get columns...
-
- if ($opt{'col'})
- {
- $sth{'col'}=$dbh->prepare("SHOW COLUMNS FROM `$row{'tbl'}->[0]` FROM `$row{'db'}->[0]`");
- $sth{'col'}->execute;
- unless ($done_create_table{$info_col})
- {
- $done_create_table{$info_col}=1;
- do_create_table("col",$info_col,
- "`Database` ".$extra_col_desc{'db'}.","
- ."`Table` ".$extra_col_desc{'tbl'}.","
- ."`Seq_in_table` BIGINT(3)");
-#We need to add a sequence number (1 for the first column of the table,
-#2 for the second etc) so that users are able to retrieve columns in order
-#if they want. This is not needed for INDEX
-#(where there is already Seq_in_index)
- $dbh->do("DELETE FROM $info_col WHERE `Database`
- LIKE $db_like_wild
- AND `Table` LIKE $tbl_like_wild");
- }
- my $col_number=0;
- while ($row{'col'}=$sth{'col'}->fetchrow_arrayref)
- {
- $dbh->do("INSERT INTO $info_col VALUES("
- .$dbh->quote($row{'db'}->[0]).","
- .$dbh->quote($row{'tbl'}->[0]).","
- .++$col_number.","
- .join(',' , ( map $dbh->quote($_), @{$row{'col'}} ) ).")");
- }
- }
-
-#and get index.
-
- if ($opt{'idx'})
- {
- $sth{'idx'}=$dbh->prepare("SHOW INDEX FROM `$row{'tbl'}->[0]` FROM `$row{'db'}->[0]`");
- $sth{'idx'}->execute;
- unless ($done_create_table{$info_idx})
- {
- $done_create_table{$info_idx}=1;
- do_create_table("idx",$info_idx,
- "`Database` ".$extra_col_desc{'db'});
- $dbh->do("DELETE FROM $info_idx WHERE `Database`
- LIKE $db_like_wild
- AND `Table` LIKE $tbl_like_wild");
- }
- while ($row{'idx'}=$sth{'idx'}->fetchrow_arrayref)
- {
- $dbh->do("INSERT INTO $info_idx VALUES("
- .$dbh->quote($row{'db'}->[0]).","
- .join(',' , ( map $dbh->quote($_), @{$row{'idx'}} ) ).")");
- }
- }
- }
-}
-
-print "Wrote to database $db_to_write .\n" unless ($opt{'quiet'});
-exit;
-
-
-sub do_create_table
-{
- my ($sth_key,$target_tbl,$extra_col_desc,$first_col_name)=@_;
- my $create_table_query=$extra_col_desc;
- my ($i,$first_col_desc,$col_desc);
-
- for ($i=0;$i<$sth{$sth_key}->{NUM_OF_FIELDS};$i++)
- {
- if ($create_table_query) { $create_table_query.=", "; }
- $col_desc=$sth{$sth_key}->{mysql_type_name}->[$i];
- if ($col_desc =~ /char|int/i)
- {
- $col_desc.="($sth{$sth_key}->{PRECISION}->[$i])";
- }
- elsif ($col_desc =~ /decimal|numeric/i) #(never seen that)
- {
- $col_desc.=
- "($sth{$sth_key}->{PRECISION}->[$i],$sth{$sth_key}->{SCALE}->[$i])";
- }
- elsif ($col_desc !~ /date/i) #date and datetime are OK,
- #no precision or scale for them
- {
- warn "unexpected column type '$col_desc'
-(neither 'char','int','decimal|numeric')
-when creating $target_tbl, hope table creation will go OK\n";
- }
- if ($i==0) {$first_col_desc=$col_desc};
- $create_table_query.=
- ( ($i==0 and $first_col_name) ?
- "$first_col_name " :"`$sth{$sth_key}->{NAME}->[$i]` " )
- .$col_desc;
- }
-if ($create_table_query)
-{
- $dbh->do("CREATE TABLE IF NOT EXISTS $target_tbl ($create_table_query)");
-}
-return $first_col_desc;
-}
-
-__END__
-
-
-=head1 DESCRIPTION
-
-mysql_tableinfo asks a MySQL server information about its
-databases, tables, table columns and index, and stores this
-in tables called `db`, `tbl` (or `tbl_status`), `col`, `idx`
-(with an optional prefix specified with --prefix).
-After that, you can query these information tables, for example
-to build your admin scripts with SQL queries, like
-
-SELECT CONCAT("CHECK TABLE ",`database`,".",`table`," EXTENDED;")
-FROM info.tbl WHERE ... ;
-
-as people usually do with some other RDBMS
-(note: to increase the speed of your queries on the info tables,
-you may add some index on them).
-
-The database_like_wild and table_like_wild instructs the program
-to gather information only about databases and tables
-whose names match these patterns. If the info
-tables already exist, their rows matching the patterns are simply
-deleted and replaced by the new ones. That is,
-old rows not matching the patterns are not touched.
-If the database_like_wild and table_like_wild arguments
-are not specified on the command-line they default to "%".
-
-The program :
-
-- does CREATE DATABASE IF NOT EXISTS database_to_write
-where database_to_write is the database name specified on the command-line.
-
-- does CREATE TABLE IF NOT EXISTS database_to_write.`db`
-
-- fills database_to_write.`db` with the output of
-SHOW DATABASES LIKE database_like_wild
-
-- does CREATE TABLE IF NOT EXISTS database_to_write.`tbl`
-(respectively database_to_write.`tbl_status`
-if the --tbl-status option is on)
-
-- for every found database,
-fills database_to_write.`tbl` (respectively database_to_write.`tbl_status`)
-with the output of
-SHOW TABLES FROM found_db LIKE table_like_wild
-(respectively SHOW TABLE STATUS FROM found_db LIKE table_like_wild)
-
-- if the --col option is on,
- * does CREATE TABLE IF NOT EXISTS database_to_write.`col`
- * for every found table,
- fills database_to_write.`col` with the output of
- SHOW COLUMNS FROM found_tbl FROM found_db
-
-- if the --idx option is on,
- * does CREATE TABLE IF NOT EXISTS database_to_write.`idx`
- * for every found table,
- fills database_to_write.`idx` with the output of
- SHOW INDEX FROM found_tbl FROM found_db
-
-Some options may modify this general scheme (see below).
-
-As mentioned, the contents of the info tables are the output of
-SHOW commands. In fact the contents are slightly more complete :
-
-- the `tbl` (or `tbl_status`) info table
- has an extra column which contains the database name,
-
-- the `col` info table
- has an extra column which contains the table name,
- and an extra column which contains, for each described column,
- the number of this column in the table owning it (this extra column
- is called `Seq_in_table`). `Seq_in_table` makes it possible for you
- to retrieve your columns in sorted order, when you are querying
- the `col` table.
-
-- the `index` info table
- has an extra column which contains the database name.
-
-Caution: info tables contain certain columns (e.g.
-Database, Table, Null...) whose names, as they are MySQL reserved words,
-need to be backquoted (`...`) when used in SQL statements.
-
-Caution: as information fetching and info tables filling happen at the
-same time, info tables may contain inaccurate information about
-themselves.
-
-=head1 OPTIONS
-
-=over 4
-
-=item --clear
-
-Does DROP TABLE on the info tables (only those that the program is
-going to fill, for example if you do not use --col it won't drop
-the `col` table) and processes normally. Does not drop database_to_write.
-
-=item --clear-only
-
-Same as --clear but exits after the DROPs.
-
-=item --col
-
-Adds columns information (into table `col`).
-
-=item --idx
-
-Adds index information (into table `idx`).
-
-=item --prefix prefix
-
-The info tables are named from the concatenation of prefix and,
-respectively, db, tbl (or tbl_status), col, idx. Do not quote ('')
-or backquote (``) prefix.
-
-=item -q, --quiet
-
-Does not warn you about what the script is going to do (DROP TABLE etc)
-and does not ask for a confirmation before starting.
-
-=item --tbl-status
-
-Instead of using SHOW TABLES, uses SHOW TABLE STATUS
-(much more complete information, but slower).
-
-=item --help
-
-Display helpscreen and exit
-
-=item -u, --user=#
-
-user for database login if not current user. Give a user
-who has sufficient privileges (CREATE, ...).
-
-=item -p, --password=#
-
-password to use when connecting to server
-
-=item -h, --host=#
-
-host to connect to
-
-=item -P, --port=#
-
-port to use when connecting to server
-
-=item -S, --socket=#
-
-UNIX domain socket to use when connecting to server
-
-=head1 WARRANTY
-
-This software is free and comes without warranty of any kind.
-
-Patches adding bug fixes, documentation and new features are welcome.
-
-=head1 TO DO
-
-Nothing: starting from MySQL 5.0, this program is replaced by the
-INFORMATION_SCHEMA pseudo-database.
-
-=head1 AUTHOR
-
-2002-06-18 Guilhem Bichot (guilhem.bichot@mines-paris.org)
-
-And all the authors of mysqlhotcopy, which served as a model for
-the structure of the program.
diff --git a/scripts/mysql_upgrade_shell.sh b/scripts/mysql_upgrade_shell.sh
deleted file mode 100644
index 8a24a0d0740..00000000000
--- a/scripts/mysql_upgrade_shell.sh
+++ /dev/null
@@ -1,215 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002-2003 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
-
-# Runs mysqlcheck --check-upgrade in case it has not been done on this
-# major MySQL version
-
-# This script should always be run when upgrading from one major version
-# to another (ie: 4.1 -> 5.0 -> 5.1)
-
-#
-# Note that in most cases one have to use '--password' as
-# arguments as these needs to be passed on to the mysqlcheck command
-
-
-user=root
-
-case "$1" in
- --no-defaults|--defaults-file=*|--defaults-extra-file=*)
- defaults="$1"; shift
- ;;
-esac
-
-parse_arguments() {
- # We only need to pass arguments through to the server if we don't
- # handle them here. So, we collect unrecognized options (passed on
- # the command line) into the args variable.
- pick_args=
- if test "$1" = PICK-ARGS-FROM-ARGV
- then
- pick_args=1
- shift
- fi
-
- for arg do
- case "$arg" in
- --basedir=*) MY_BASEDIR_VERSION=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
- --user=*) user=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
- --ldata=*|--data=*|--datadir=*) DATADIR=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
- --force) force=1 ;;
- --verbose) verbose=1 ;;
- --help) help_option=1 ;;
- *)
- if test -n "$pick_args"
- then
- # This sed command makes sure that any special chars are quoted,
- # so the arg gets passed exactly to the server.
- args="$args "`echo "$arg" | sed -e 's,\([^a-zA-Z0-9_.=-]\),\\\\\1,g'`
- fi
- ;;
- esac
- done
-}
-
-#
-# Find where my_print_defaults is
-#
-
-find_my_print_defaults () {
- if test -x ./bin/my_print_defaults
- then
- print_defaults="./bin/my_print_defaults"
- elif test -x ./extra/my_print_defaults
- then
- print_defaults="./extra/my_print_defaults"
- elif test -x @bindir@/my_print_defaults
- then
- print_defaults="@bindir@/my_print_defaults"
- elif test -x @bindir@/mysql_print_defaults
- then
- print_defaults="@bindir@/mysql_print_defaults"
- else
- print_defaults="my_print_defaults"
- fi
-}
-
-find_my_print_defaults
-
-# Get first arguments from the my.cfg file, groups [mysqld] and
-# [mysql_upgrade], and then merge with the command line arguments
-
-args=
-DATADIR=
-bindir=
-MY_BASEDIR_VERSION=
-verbose=0
-force=0
-help_option=0
-
-parse_arguments `$print_defaults $defaults mysqld mysql_upgrade`
-parse_arguments PICK-ARGS-FROM-ARGV "$@"
-
-if test $help_option = 1
-then
- echo "MySQL utility script to upgrade database to the current server version"
- echo ""
- echo "It takes the following arguments:"
- echo " --help Show this help message"
- echo " --basedir Specifies the directory where MySQL is installed"
- echo " --datadir Specifies the data directory"
- echo " --force Mysql_upgrade.info file will be ignored"
- echo " --user Username for server login if not current user"
- echo " --verbose Display more output about the process"
- echo ""
-
- exit 0
-fi
-
-#
-# Try to find where binaries are installed
-#
-
-MY_PWD=`pwd`
-# Check for the directories we would expect from a binary release install
-if test -z "$MY_BASEDIR_VERSION"
-then
- if test -f ./share/mysql/english/errmsg.sys -a -x ./bin/mysqld
- then
- MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are
- bindir="$MY_BASEDIR_VERSION/bin"
- # Check for the directories we would expect from a source install
- elif test -f ./share/mysql/english/errmsg.sys -a -x ./libexec/mysqld
- then
- MY_BASEDIR_VERSION=$MY_PWD # Where libexec, share and var are
- bindir="$MY_BASEDIR_VERSION/bin"
-# Since we didn't find anything, used the compiled-in defaults
- else
- MY_BASEDIR_VERSION=@prefix@
- bindir=@bindir@
- fi
-else
- bindir="$MY_BASEDIR_VERSION/bin"
-fi
-
-#
-# Try to find the data directory
-#
-
-if test -z "$DATADIR"
-then
- # Try where the binary installs put it
- if test -d $MY_BASEDIR_VERSION/data/mysql
- then
- DATADIR=$MY_BASEDIR_VERSION/data
- # Next try where the source installs put it
- elif test -d $MY_BASEDIR_VERSION/var/mysql
- then
- DATADIR=$MY_BASEDIR_VERSION/var
- # Or just give up and use our compiled-in default
- else
- DATADIR=@localstatedir@
- fi
-fi
-
-if test ! -x "$bindir/mysqlcheck"
-then
- echo "Can't find program '$bindir/mysqlcheck'"
- echo "Please restart with --basedir=mysql-install-directory"
- exit 1
-fi
-
-if test ! -f "$DATADIR/mysql/user.frm"
-then
- echo "Can't find data directory. Please restart with --datadir=path-to-data-dir"
- exit 1
-fi
-
-CHECK_FILE=$DATADIR/mysql_upgrade.info
-
-if test -f $CHECK_FILE -a $force = 0
-then
- version=`cat $CHECK_FILE`
- if test "$version" = "@MYSQL_BASE_VERSION@"
- then
- if test $verbose = 1
- then
- echo "mysql_upgrade already done for this version"
- fi
- $bindir/mysql_fix_privilege_tables --silent $args
- exit 0
- fi
-fi
-
-#
-# Run the upgrade
-#
-
-check_args="--check-upgrade --all-databases --auto-repair --user=$user"
-
-if test $verbose = 1
-then
- echo "Running $bindir/mysqlcheck $args $check_args"
-fi
-
-$bindir/mysqlcheck $check_args $args
-if [ $? = 0 ]
-then
- # Remember base version so that we don't run this script again on the
- # same base version
- echo "@MYSQL_BASE_VERSION@" > $CHECK_FILE
-fi
-
-$bindir/mysql_fix_privilege_tables --silent --user=$user $args
diff --git a/scripts/mysqld_safe-watch.sh b/scripts/mysqld_safe-watch.sh
deleted file mode 100644
index c837ba9a118..00000000000
--- a/scripts/mysqld_safe-watch.sh
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/bin/sh
-# Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB
-# This file is public domain and comes with NO WARRANTY of any kind
-#
-# scripts to start the MySQL demon and restart it if it dies unexpectedly
-#
-# This should be executed in the MySQL base directory if you are using a
-# binary installation that has other paths than you are using.
-#
-# mysql.server works by first doing a cd to the base directory and from there
-# executing mysqld_safe
-
-# Check if we are starting this relative (for the binary release)
-if test -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
- -x ./bin/mysqld
-then
- MY_BASEDIR_VERSION=`pwd` # Where bin, share and data is
- DATADIR=$MY_BASEDIR_VERSION/data # Where the databases are
- ledir=$MY_BASEDIR_VERSION/bin # Where mysqld are
-# Check if this is a 'moved install directory'
-elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
- -x ./libexec/mysqld
-then
- MY_BASEDIR_VERSION=`pwd` # Where libexec, share and var is
- DATADIR=$MY_BASEDIR_VERSION/var # Where the databases are
- ledir=$MY_BASEDIR_VERSION/libexec # Where mysqld are
-else
- MY_BASEDIR_VERSION=/usr/local/mysql
- DATADIR=/usr/local/mysql/var
- ledir=/usr/local/mysql/libexec
-fi
-
-hostname=`@HOSTNAME@`
-pidfile=$DATADIR/$hostname.pid
-log=$DATADIR/$hostname.log
-err=$DATADIR/$hostname.err
-lockfile=$DATADIR/$hostname.lock
-
-#
-# If there exists an old pid file, check if the demon is already running
-# Note: The switches to 'ps' may depend on your operating system
-
-if test -f $pidfile
-then
- PID=`cat $pidfile`
- if /bin/kill -0 $PID
- then
- if /bin/ps -p $PID | grep mysqld > /dev/null
- then # The pid contains a mysqld process
- echo "A mysqld process already exists"
- echo "A mysqld process already exists at " `date` >> $log
- exit 1;
- fi
- fi
- rm -f $pidfile
- if test -f $pidfile
- then
- echo "Fatal error: Can't remove the pid file: $pidfile"
- echo "Fatal error: Can't remove the pid file: $pidfile at " `date` >> $log
- echo "Please remove it manually and start $0 again"
- echo "mysqld demon not started"
- exit 1;
- fi
-fi
-
-echo "Starting mysqld demon with databases from $DATADIR"
-
-#Default communication ports
-#MYSQL_TCP_PORT=3306
-if test -z "$MYSQL_UNIX_PORT"
-then
- MYSQL_UNIX_PORT="/tmp/mysql.sock"
- export MYSQL_UNIX_PORT
-fi
-#export MYSQL_TCP_PORT
-
-# Does this work on all systems?
-#if type ulimit | grep "shell builtin" > /dev/null
-#then
-# ulimit -n 256 > /dev/null 2>&1 # Fix for BSD and FreeBSD systems
-#fi
-
-echo "mysqld started on " `date` >> $log
-bin/zap -f $lockfile < /dev/null > /dev/null 2>&1
-rm -f $lockfile
-$MY_BASEDIR_VERSION/bin/watchdog_mysqld $lockfile $pidfile $MY_BASEDIR_VERSION/bin $DATADIR 3 10 >> $err 2>&1 &
-restart_pid=$!
-
-while true
-do
- rm -f $MYSQL_UNIX_PORT $pidfile # Some extra safety
- lockfile -1 -r10 $lockfile >/dev/null 2>&1
- if test "$#" -eq 0
- then
- nohup $ledir/mysqld --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR \
- --skip-external-locking >> $err 2>&1 &
- else
- nohup $ledir/mysqld --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR \
- --skip-external-locking "$@" >> $err 2>&1 &
- fi
- pid=$!
- rm -f $lockfile
- wait $pid;
-
- lockfile -1 -r10 $lockfile >/dev/null 2>&1
- rm -f $lockfile
- if test ! -f $pidfile # This is removed if normal shutdown
- then
- break;
- fi
- if true
- then
- # Test if one proces was hanging.
- # This is only a fix for Linux (running as base 3 mysqld processes)
- # but should work for the rest of the servers.
- # The only thing is ps x => redhat 5 gives warnings when using ps -x.
- # kill -9 is used or the proces won't react on the kill.
- numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld`
- echo -e "\nNumber of processes running now: $numofproces" | tee -a $log
- I=1
- while test "$I" -le "$numofproces"
- do
- PROC=`ps x | grep $ledir/mysqld | grep -v "grep" | tail -1`
- for T in $PROC
- do
- break
- done
- # echo "TEST $I - $T **"
- if kill -9 $T
- then
- echo "mysqld proces hanging, pid $T - killed" | tee -a $log
- else
- break
- fi
- I=`expr $I + 1`
- done
- fi
- echo "mysqld restarted" | tee -a $log
- # Check all tables and repair any wrong tables.
- $MY_BASEDIR_VERSION/bin/isamchk -sf $DATADIR/*/*.ISM >> $err 2>&1
-done
-if test $restart_pid -gt 0
-then
- kill $restart_pid > /dev/null 2>&1
- sleep 1;
- kill -9 $restart_pid > /dev/null 2>&1
-fi
-
-echo -n "mysqld ended on " `date` >> $log
-echo "mysqld demon ended"
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index 52fe282f916..bfaa1d57ed2 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -31,7 +31,6 @@ Usage: $0 [OPTIONS]
--defaults-file=FILE Use the specified defaults file
--defaults-extra-file=FILE Also use defaults from the specified file
--ledir=DIRECTORY Look for mysqld in the specified directory
- --log-error=FILE Log errors to the specified log file
--open-files-limit=LIMIT Limit the number of open files
--core-file-size=LIMIT Limit core files to the specified size
--timezone=TZ Set the system timezone
@@ -46,6 +45,11 @@ EOF
exit 1
}
+shell_quote_string() {
+ # This sed command makes sure that any special chars are quoted,
+ # so the arg gets passed exactly to the server.
+ echo "$1" | sed -e 's,\([^a-zA-Z0-9/_.=-]\),\\\1,g'
+}
parse_arguments() {
# We only need to pass arguments through to the server if we don't
@@ -69,14 +73,14 @@ parse_arguments() {
--pid-file=*) pid_file=`echo "$arg" | sed -e "s;--pid-file=;;"` ;;
--user=*) user=`echo "$arg" | sed -e "s;--[^=]*=;;"` ; SET_USER=1 ;;
- # these two might have been set in a [mysqld_safe] section of my.cnf
+ # these might have been set in a [mysqld_safe] section of my.cnf
# they are added to mysqld command line to override settings from my.cnf
+ --log-error=*) err_log=`echo "$arg" | sed -e "s;--log-error=;;"` ;;
--socket=*) mysql_unix_port=`echo "$arg" | sed -e "s;--socket=;;"` ;;
--port=*) mysql_tcp_port=`echo "$arg" | sed -e "s;--port=;;"` ;;
# mysqld_safe-specific options - must be set in my.cnf ([mysqld_safe])!
--ledir=*) ledir=`echo "$arg" | sed -e "s;--ledir=;;"` ;;
- --log-error=*) err_log=`echo "$arg" | sed -e "s;--log-error=;;"` ;;
--open-files-limit=*) open_files=`echo "$arg" | sed -e "s;--open-files-limit=;;"` ;;
--core-file-size=*) core_file_size=`echo "$arg" | sed -e "s;--core-file-size=;;"` ;;
--timezone=*) TZ=`echo "$arg" | sed -e "s;--timezone=;;"` ; export TZ; ;;
@@ -97,9 +101,7 @@ parse_arguments() {
*)
if test -n "$pick_args"
then
- # This sed command makes sure that any special chars are quoted,
- # so the arg gets passed exactly to the server.
- args="$args "`echo "$arg" | sed -e 's,\([^a-zA-Z0-9_.-]\),\\\\\1,g'`
+ append_arg_to_args "$arg"
fi
;;
esac
@@ -194,6 +196,10 @@ else
print_defaults="my_print_defaults"
fi
+append_arg_to_args () {
+ args="$args "`shell_quote_string "$1"`
+}
+
args=
SET_USER=2
parse_arguments `$print_defaults $defaults --loose-verbose mysqld server`
@@ -214,15 +220,10 @@ then
chmod 755 $mysql_unix_port_dir
fi
-# Use the mysqld-max binary by default if the user doesn't specify a binary
+# If the user doesn't specify a binary, we assume name "mysqld"
if test -z "$MYSQLD"
then
- if test -x $ledir/mysqld-max
- then
- MYSQLD=mysqld-max
- else
- MYSQLD=mysqld
- fi
+ MYSQLD=mysqld
fi
if test ! -x $ledir/$MYSQLD
@@ -245,15 +246,39 @@ else
* ) pid_file="$DATADIR/$pid_file" ;;
esac
fi
-test -z "$err_log" && err_log=$DATADIR/`@HOSTNAME@`.err
+append_arg_to_args "--pid-file=$pid_file"
+
+if [ -n "$err_log" ]
+then
+ # mysqld adds ".err" if there is no extension on the --log-err
+ # argument; must match that here, or mysqld_safe will write to a
+ # different log file than mysqld
+
+ # mysqld does not add ".err" to "--log-error=foo."; it considers a
+ # trailing "." as an extension
+ if expr "$err_log" : '.*\.[^/]*$' > /dev/null
+ then
+ :
+ else
+ err_log="$err_log".err
+ fi
+
+ case "$err_log" in
+ /* ) ;;
+ * ) err_log="$DATADIR/$err_log" ;;
+ esac
+else
+ err_log=$DATADIR/`@HOSTNAME@`.err
+fi
+append_arg_to_args "--log-error=$err_log"
if test -n "$mysql_unix_port"
then
- args="--socket=$mysql_unix_port $args"
+ append_arg_to_args "--socket=$mysql_unix_port"
fi
if test -n "$mysql_tcp_port"
then
- args="--port=$mysql_tcp_port $args"
+ append_arg_to_args "--port=$mysql_tcp_port"
fi
if test $niceness -eq 0
@@ -320,7 +345,7 @@ then
if test -n "$open_files"
then
ulimit -n $open_files
- args="--open-files-limit=$open_files $args"
+ append_arg_to_args "--open-files-limit=$open_files"
fi
fi
@@ -381,12 +406,18 @@ echo "`date +'%y%m%d %H:%M:%S mysqld started'`" >> $err_log
while true
do
rm -f $safe_mysql_unix_port $pid_file # Some extra safety
- if test -z "$args"
- then
- $NOHUP_NICENESS $ledir/$MYSQLD $defaults --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR $USER_OPTION --pid-file=$pid_file @MYSQLD_DEFAULT_SWITCHES@ >> $err_log 2>&1
- else
- eval "$NOHUP_NICENESS $ledir/$MYSQLD $defaults --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR $USER_OPTION --pid-file=$pid_file @MYSQLD_DEFAULT_SWITCHES@ $args >> $err_log 2>&1"
- fi
+
+ cmd="$NOHUP_NICENESS"
+
+ for i in "$ledir/$MYSQLD" "$defaults" "--basedir=$MY_BASEDIR_VERSION" \
+ "--datadir=$DATADIR" "$USER_OPTION"
+ do
+ cmd="$cmd "`shell_quote_string "$i"`
+ done
+ cmd="$cmd $args >> "`shell_quote_string "$err_log"`" 2>&1"
+ #echo "Running mysqld: [$cmd]"
+ eval "$cmd"
+
if test ! -f $pid_file # This is removed if normal shutdown
then
echo "STOPPING server from pid file $pid_file"
View Lorry Controller Status