mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 18:41:56 +01:00
e63b5546c5
It includes speed optimizations for HANDLER READ by caching as much as possible in HANDLER OPEN Other things: - Added mysqld option --disable-thr-alarm to be able to benchmark things without thr_alarm - Changed 'Locked' state to 'System lock' and 'Table lock' (these where used in the code but never shown to end user) - Better error message if mysql_install_db.sh fails - Moved handler function prototypes to sql_handler.h - Remove not anymore used 'thd->locked' member include/thr_alarm.h: Added my_disable_thr_alarm include/thr_lock.h: Add new member to THR_LOCK_DATA to remember original lock type state. This is needed as thr_unlock() resets type to TL_UNLOCK. mysql-test/include/check_no_concurrent_insert.inc: Locked -> Table lock mysql-test/include/handler.inc: Locked -> Table lock mysql-test/r/handler_innodb.result: Updated results for new tests mysql-test/r/handler_myisam.result: Updated results for new tests mysql-test/r/sp-threads.result: Locked -> Table lock mysql-test/suite/binlog/t/binlog_stm_row.test: Locked -> Table lock mysql-test/suite/funcs_1/datadict/processlist_val.inc: Locked -> Table lock mysql-test/suite/pbxt/t/lock_multi.test: Locked -> Table lock mysql-test/suite/sys_vars/r/concurrent_insert_func.result: Locked -> Table lock mysql-test/suite/sys_vars/t/concurrent_insert_func.test: Locked -> Table lock mysql-test/suite/sys_vars/t/delayed_insert_limit_func.test: Locked -> Table lock mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test: Locked -> Table lock mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test: Locked -> Table lock mysql-test/t/insert_notembedded.test: Locked -> Table lock mysql-test/t/lock_multi.test: Locked -> Table lock mysql-test/t/merge-big.test: Locked -> Table lock mysql-test/t/multi_update.test: Locked -> Table lock mysql-test/t/query_cache_28249.test: Locked -> Table lock mysql-test/t/sp_notembedded.test: Locked -> Table lock mysql-test/t/sp_sync.test: Locked -> Table lock mysql-test/t/status.test: Locked -> Table lock mysql-test/t/trigger_notembedded.test: Locked -> Table lock mysys/thr_alarm.c: Added option to disable thr_alarm mysys/thr_lock.c: Detect loops scripts/mysql_install_db.sh: Give better error message if something goes wrong sql/Makefile.am: Added sql_handler.h sql/lock.cc: Split functions to allow one to cache value if store_lock() (for HANDLER functions). - Split mysql_lock_tables() into two functions, where first one allocates MYSQL_LOCK and other other one uses it. - Made get_lock_data() an external function. - Added argument to mysql_unlock_tables() to not free sql_lock. - Added argument to reset_lock_data() to reset lock structure to initial state (as after get_lock_data()) sql/mysql_priv.h: Moved handler function prototypes to sql_handler.h Added new lock functions. sql/mysqld.cc: Added --thread-alarm startup option sql/net_serv.cc: Don't call vio_blocking() if not needed sql/sql_base.cc: include sql_handler.h sql/sql_class.cc: include sql_handler.h Remove not anymore used 'thd->locked' member sql/sql_class.h: Remove not anymore used 'thd->locked' member sql/sql_db.cc: include sql_handler.h sql/sql_delete.cc: include sql_handler.h sql/sql_handler.cc: Rewrote all code to use SQL_HANDLER instead of TABLE_LIST (original interface) Rewrote mysql_ha_open() to cache all things from TABLE_LIST and items for field list, where etc. In mysql_ha_open() also cache MYSQL_LOCK structure from get_lock_data(). Split functions into smaller sub functions (needed to be able to implement mysql_ha_read_prepare()) Added mysql_ha_read_prepare() to allow one to prepare HANDLER READ. sql/sql_handler.h: Interface to sql_handler.cc sql/sql_parse.cc: include sql_handler.h sql/sql_prepare.cc: Added mysql_test_handler_read(), prepare for HANDLER READ sql/sql_rename.cc: include sql_handler.h sql/sql_show.cc: Removed usage of thd->locked sql/sql_table.cc: include sql_handler.h sql/sql_trigger.cc: include sql_handler.h
484 lines
15 KiB
Bash
484 lines
15 KiB
Bash
#!/bin/sh
|
|
# Copyright (C) 2002-2003 MySQL AB & Monty Program 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
|
|
|
|
# This scripts creates the MariaDB Server system tables
|
|
#
|
|
# All unrecognized arguments to this script are passed to mysqld.
|
|
|
|
basedir=""
|
|
builddir=""
|
|
ldata="@localstatedir@"
|
|
langdir=""
|
|
srcdir=""
|
|
|
|
args=""
|
|
defaults=""
|
|
mysqld_opt=""
|
|
user=""
|
|
|
|
force=0
|
|
in_rpm=0
|
|
ip_only=0
|
|
cross_bootstrap=0
|
|
|
|
usage()
|
|
{
|
|
cat <<EOF
|
|
Usage: $0 [OPTIONS]
|
|
--basedir=path The path to the MariaDB installation directory.
|
|
--builddir=path If using --srcdir with out-of-directory builds, you
|
|
will need to set this to the location of the build
|
|
directory where built files reside.
|
|
--cross-bootstrap For internal use. Used when building the MariaDB system
|
|
tables on a different host than the target.
|
|
--datadir=path The path to the MariaDB data directory.
|
|
--force Causes mysql_install_db to run even if DNS does not
|
|
work. In that case, grant table entries that normally
|
|
use hostnames will use IP addresses.
|
|
--ldata=path The path to the MariaDB data directory. Same as
|
|
--datadir.
|
|
--rpm For internal use. This option is used by RPM files
|
|
during the MariaDB installation process.
|
|
--skip-name-resolve Use IP addresses rather than hostnames when creating
|
|
grant table entries. This option can be useful if
|
|
your DNS does not work.
|
|
--srcdir=path The path to the MariaDB source directory. This option
|
|
uses the compiled binaries and support files within the
|
|
source tree, useful for if you don't want to install
|
|
MariaDB yet and just want to create the system tables.
|
|
--user=user_name The login username to use for running mysqld. Files
|
|
and directories created by mysqld will be owned by this
|
|
user. You must be root to use this option. By default
|
|
mysqld runs using your current login name and files and
|
|
directories that it creates will be owned by you.
|
|
|
|
All other options are passed to the mysqld program
|
|
|
|
EOF
|
|
exit 1
|
|
}
|
|
|
|
s_echo()
|
|
{
|
|
if test "$in_rpm" -eq 0 -a "$cross_bootstrap" -eq 0
|
|
then
|
|
echo "$1"
|
|
fi
|
|
}
|
|
|
|
parse_arg()
|
|
{
|
|
echo "$1" | sed -e 's/^[^=]*=//'
|
|
}
|
|
|
|
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
|
|
--force) force=1 ;;
|
|
--basedir=*) basedir=`parse_arg "$arg"` ;;
|
|
--builddir=*) builddir=`parse_arg "$arg"` ;;
|
|
--srcdir=*) srcdir=`parse_arg "$arg"` ;;
|
|
--ldata=*|--datadir=*) ldata=`parse_arg "$arg"` ;;
|
|
--user=*)
|
|
# Note that the user will be passed to mysqld so that it runs
|
|
# as 'user' (crucial e.g. if log-bin=/some_other_path/
|
|
# where a chown of datadir won't help)
|
|
user=`parse_arg "$arg"` ;;
|
|
--skip-name-resolve) ip_only=1 ;;
|
|
--verbose) verbose=1 ;; # Obsolete
|
|
--rpm) in_rpm=1 ;;
|
|
--help) usage ;;
|
|
--no-defaults|--defaults-file=*|--defaults-extra-file=*)
|
|
defaults="$arg" ;;
|
|
|
|
--cross-bootstrap|--windows)
|
|
# Used when building the MariaDB system tables on a different host than
|
|
# the target. The platform-independent files that are created in
|
|
# --datadir on the host can be copied to the target system.
|
|
#
|
|
# The most common use for this feature is in the Windows installer
|
|
# which will take the files from datadir and include them as part of
|
|
# the install package. See top-level 'dist-hook' make target.
|
|
#
|
|
# --windows is a deprecated alias
|
|
cross_bootstrap=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.
|
|
# XXX: This is broken; true fix requires using eval and proper
|
|
# quoting of every single arg ($basedir, $ldata, etc.)
|
|
#args="$args "`echo "$arg" | sed -e 's,\([^a-zA-Z0-9_.-]\),\\\\\1,g'`
|
|
args="$args $arg"
|
|
fi
|
|
;;
|
|
esac
|
|
done
|
|
}
|
|
|
|
# Try to find a specific file within --basedir which can either be a binary
|
|
# release or installed source directory and return the path.
|
|
find_in_basedir()
|
|
{
|
|
case "$1" in
|
|
--dir)
|
|
return_dir=1; shift
|
|
;;
|
|
esac
|
|
|
|
file=$1; shift
|
|
|
|
for dir in "$@"
|
|
do
|
|
if test -f "$basedir/$dir/$file"
|
|
then
|
|
if test -n "$return_dir"
|
|
then
|
|
echo "$basedir/$dir"
|
|
else
|
|
echo "$basedir/$dir/$file"
|
|
fi
|
|
break
|
|
fi
|
|
done
|
|
}
|
|
|
|
cannot_find_file()
|
|
{
|
|
echo
|
|
echo "FATAL ERROR: Could not find $1"
|
|
|
|
shift
|
|
if test $# -ne 0
|
|
then
|
|
echo
|
|
echo "The following directories were searched:"
|
|
echo
|
|
for dir in "$@"
|
|
do
|
|
echo " $dir"
|
|
done
|
|
fi
|
|
|
|
echo
|
|
echo "If you compiled from source, you need to run 'make install' to"
|
|
echo "copy the software into the correct location ready for operation."
|
|
echo
|
|
echo "If you are using a binary release, you must either be at the top"
|
|
echo "level of the extracted archive, or pass the --basedir option"
|
|
echo "pointing to that location."
|
|
echo
|
|
}
|
|
|
|
# Ok, let's go. We first need to parse arguments which are required by
|
|
# my_print_defaults so that we can execute it first, then later re-parse
|
|
# the command line to add any extra bits that we need.
|
|
parse_arguments PICK-ARGS-FROM-ARGV "$@"
|
|
|
|
#
|
|
# We can now find my_print_defaults. This script supports:
|
|
#
|
|
# --srcdir=path pointing to compiled source tree
|
|
# --basedir=path pointing to installed binary location
|
|
#
|
|
# or default to compiled-in locations.
|
|
#
|
|
if test -n "$srcdir" && test -n "$basedir"
|
|
then
|
|
echo "ERROR: Specify either --basedir or --srcdir, not both."
|
|
exit 1
|
|
fi
|
|
if test -n "$srcdir"
|
|
then
|
|
if test -z "$builddir"
|
|
then
|
|
builddir="$srcdir"
|
|
fi
|
|
print_defaults="$builddir/extra/my_print_defaults"
|
|
elif test -n "$basedir"
|
|
then
|
|
print_defaults=`find_in_basedir my_print_defaults bin extra`
|
|
if test -z "$print_defaults"
|
|
then
|
|
cannot_find_file my_print_defaults $basedir/bin $basedir/extra
|
|
exit 1
|
|
fi
|
|
else
|
|
print_defaults="@bindir@/my_print_defaults"
|
|
fi
|
|
|
|
if test ! -x "$print_defaults"
|
|
then
|
|
cannot_find_file "$print_defaults"
|
|
exit 1
|
|
fi
|
|
|
|
# Now we can get arguments from the groups [mysqld] and [mysql_install_db]
|
|
# in the my.cfg file, then re-run to merge with command line arguments.
|
|
parse_arguments `$print_defaults $defaults mysqld mysql_install_db`
|
|
parse_arguments PICK-ARGS-FROM-ARGV "$@"
|
|
|
|
# Configure paths to support files
|
|
if test -n "$srcdir"
|
|
then
|
|
basedir="$builddir"
|
|
bindir="$basedir/client"
|
|
extra_bindir="$basedir/extra"
|
|
mysqld="$basedir/sql/mysqld"
|
|
langdir="$srcdir/sql/share/english"
|
|
pkgdatadir="$srcdir/scripts"
|
|
scriptdir="$srcdir/scripts"
|
|
elif test -n "$basedir"
|
|
then
|
|
bindir="$basedir/bin"
|
|
extra_bindir="$bindir"
|
|
mysqld=`find_in_basedir mysqld libexec sbin bin`
|
|
if test -z "$mysqld"
|
|
then
|
|
cannot_find_file mysqld $basedir/libexec $basedir/sbin $basedir/bin
|
|
exit 1
|
|
fi
|
|
langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english`
|
|
if test -z "$langdir"
|
|
then
|
|
cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english
|
|
exit 1
|
|
fi
|
|
pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql`
|
|
if test -z "$pkgdatadir"
|
|
then
|
|
cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql
|
|
exit 1
|
|
fi
|
|
scriptdir="$basedir/scripts"
|
|
else
|
|
basedir="@prefix@"
|
|
bindir="@bindir@"
|
|
extra_bindir="$bindir"
|
|
mysqld="@libexecdir@/mysqld"
|
|
pkgdatadir="@pkgdatadir@"
|
|
scriptdir="@scriptdir@"
|
|
fi
|
|
|
|
# Set up paths to SQL scripts required for bootstrap
|
|
fill_help_tables="$pkgdatadir/fill_help_tables.sql"
|
|
create_system_tables="$pkgdatadir/mysql_system_tables.sql"
|
|
fill_system_tables="$pkgdatadir/mysql_system_tables_data.sql"
|
|
|
|
for f in $fill_help_tables $create_system_tables $fill_system_tables
|
|
do
|
|
if test ! -f "$f"
|
|
then
|
|
cannot_find_file "$f"
|
|
exit 1
|
|
fi
|
|
done
|
|
|
|
if test ! -x "$mysqld"
|
|
then
|
|
cannot_find_file "$mysqld"
|
|
exit 1
|
|
fi
|
|
|
|
if test -n "$langdir"
|
|
then
|
|
if test ! -f "$langdir/errmsg.sys"
|
|
then
|
|
cannot_find_file "$langdir/errmsg.sys"
|
|
exit 1
|
|
fi
|
|
mysqld_opt="--language=$langdir"
|
|
fi
|
|
|
|
# Try to determine the hostname
|
|
hostname=`@HOSTNAME@`
|
|
|
|
# Check if hostname is valid
|
|
if test "$cross_bootstrap" -eq 0 -a "$in_rpm" -eq 0 -a "$force" -eq 0
|
|
then
|
|
resolved=`$extra_bindir/resolveip $hostname 2>&1`
|
|
if test $? -ne 0
|
|
then
|
|
resolved=`$extra_bindir/resolveip localhost 2>&1`
|
|
if test $? -ne 0
|
|
then
|
|
echo "Neither host '$hostname' nor 'localhost' could be looked up with"
|
|
echo "$extra_bindir/resolveip"
|
|
echo "Please configure the 'hostname' command to return a correct"
|
|
echo "hostname."
|
|
echo "If you want to solve this at a later stage, restart this script"
|
|
echo "with the --force option"
|
|
exit 1
|
|
fi
|
|
echo "WARNING: The host '$hostname' could not be looked up with resolveip."
|
|
echo "This probably means that your libc libraries are not 100 % compatible"
|
|
echo "with this binary MariaDB version. The MariaDB daemon, mysqld, should work"
|
|
echo "normally with the exception that host name resolving will not work."
|
|
echo "This means that you should use IP addresses instead of hostnames"
|
|
echo "when specifying MariaDB privileges !"
|
|
fi
|
|
fi
|
|
|
|
if test "$ip_only" -eq 1
|
|
then
|
|
hostname=`echo "$resolved" | awk '/ /{print $6}'`
|
|
fi
|
|
|
|
# Create database directories
|
|
for dir in $ldata $ldata/mysql $ldata/test
|
|
do
|
|
if test ! -d $dir
|
|
then
|
|
mkdir -p $dir
|
|
chmod 700 $dir
|
|
fi
|
|
if test -w / -a ! -z "$user"
|
|
then
|
|
chown $user $dir
|
|
fi
|
|
done
|
|
|
|
if test -n "$user"
|
|
then
|
|
args="$args --user=$user"
|
|
fi
|
|
|
|
# When doing a "cross bootstrap" install, no reference to the current
|
|
# host should be added to the system tables. So we filter out any
|
|
# lines which contain the current host name.
|
|
if test $cross_bootstrap -eq 1
|
|
then
|
|
filter_cmd_line="sed -e '/@current_hostname/d'"
|
|
else
|
|
filter_cmd_line="cat"
|
|
fi
|
|
|
|
# Configure mysqld command line
|
|
mysqld_bootstrap="${MYSQLD_BOOTSTRAP-$mysqld}"
|
|
mysqld_install_cmd_line="$mysqld_bootstrap $defaults $mysqld_opt --bootstrap \
|
|
--basedir=$basedir --datadir=$ldata --log-warnings=0 --loose-skip-innodb \
|
|
--loose-skip-ndbcluster $args --max_allowed_packet=8M \
|
|
--default-storage-engine=myisam \
|
|
--net_buffer_length=16K"
|
|
|
|
# Create the system and help tables by passing them to "mysqld --bootstrap"
|
|
s_echo "Installing MariaDB/MySQL system tables..."
|
|
if { echo "use mysql;"; cat $create_system_tables $fill_system_tables; } | eval "$filter_cmd_line" | $mysqld_install_cmd_line > /dev/null
|
|
then
|
|
s_echo "OK"
|
|
else
|
|
echo
|
|
echo "Installation of system tables failed! Examine the logs in"
|
|
echo "$ldata for more information."
|
|
echo
|
|
echo "The problem could be conflicting information in an external"
|
|
echo "my.cnf files. You can ignore these by doing:"
|
|
echo
|
|
echo " shell> /scripts/mysql_install_db --defaults-file=~/.my.cnf"
|
|
echo
|
|
echo "You can also try to start the mysqld daemon with:"
|
|
echo
|
|
echo " shell> $mysqld --skip-grant --general-log &"
|
|
echo
|
|
echo "and use the command line tool $bindir/mysql"
|
|
echo "to connect to the mysql database and look at the grant tables:"
|
|
echo
|
|
echo " shell> $bindir/mysql -u root mysql"
|
|
echo " mysql> show tables"
|
|
echo
|
|
echo "The latest information about mysql_install_db is available at"
|
|
echo "http://kb.askmonty.org/v/installing-system-tables-mysql_install_db."
|
|
echo "MariaDB is hosted on launchpad; You can find the latest source and"
|
|
echo "email lists at http://launchpad.net/maria"
|
|
echo
|
|
echo "Please check all of the above before mailing us! And remember, if"
|
|
echo "you do mail us, you should use the $scriptdir/mysqlbug script!"
|
|
exit 1
|
|
fi
|
|
|
|
s_echo "Filling help tables..."
|
|
if { echo "use mysql;"; cat $fill_help_tables; } | $mysqld_install_cmd_line > /dev/null
|
|
then
|
|
s_echo "OK"
|
|
else
|
|
echo
|
|
echo "WARNING: HELP FILES ARE NOT COMPLETELY INSTALLED!"
|
|
echo "The \"HELP\" command might not work properly."
|
|
fi
|
|
|
|
# Don't output verbose information if running inside bootstrap or using
|
|
# --srcdir for testing. In such cases, there's no end user looking at
|
|
# the screen.
|
|
if test "$cross_bootstrap" -eq 0 && test -z "$srcdir"
|
|
then
|
|
s_echo
|
|
s_echo "To start mysqld at boot time you have to copy"
|
|
s_echo "support-files/mysql.server to the right place for your system"
|
|
|
|
echo
|
|
echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MariaDB root USER !"
|
|
echo "To do so, start the server, then issue the following commands:"
|
|
echo
|
|
echo "$bindir/mysqladmin -u root password 'new-password'"
|
|
echo "$bindir/mysqladmin -u root -h $hostname password 'new-password'"
|
|
echo
|
|
echo "Alternatively you can run:"
|
|
echo "$bindir/mysql_secure_installation"
|
|
echo
|
|
echo "which will also give you the option of removing the test"
|
|
echo "databases and anonymous user created by default. This is"
|
|
echo "strongly recommended for production servers."
|
|
echo
|
|
echo "See the MySQL manual for more instructions."
|
|
|
|
if test "$in_rpm" -eq 0
|
|
then
|
|
echo
|
|
echo "You can start the MariaDB daemon with:"
|
|
echo "cd $basedir ; $bindir/mysqld_safe &"
|
|
echo
|
|
echo "You can test the MariaDB daemon with mysql-test-run.pl"
|
|
echo "cd $basedir/mysql-test ; perl mysql-test-run.pl"
|
|
fi
|
|
|
|
echo
|
|
echo "Please report any problems with the $scriptdir/mysqlbug script!"
|
|
echo
|
|
echo "The latest information about MariaDB is available at http://www.askmonty.org/."
|
|
echo "You can find additional information about the MySQL part at:"
|
|
echo "http://dev.mysql.com"
|
|
echo "Support MariaDB development by buying support/new features from"
|
|
echo "Monty Program Ab. You can contact us about this at sales@askmonty.org".
|
|
echo "Alternatively consider joining our community based development effort:"
|
|
echo "http://askmonty.org/wiki/index.php/MariaDB#How_can_I_participate_in_the_development_of_MariaDB"
|
|
echo
|
|
fi
|
|
|
|
exit 0
|