mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Speed up column-completion in 'mysql' Don't use ISAM if HAVE_ISAM is not defined A lot of fixes for the embedded version. All libraries are now included in libmysqld.a Changed arguments to convert_dirname() to make it more general. Renamed files in the 'merge' directory to all use a common prefix. Don't compile both assembler and C functions on x86 BitKeeper/deleted/.del-mf_pack2.c~f07795bbcf57be7: Delete: mysys/mf_pack2.c Docs/manual.texi: Updated chapter about embedded version acinclude.m4: Fix for using BDB and InnoDB with embedded client/completion_hash.cc: Speed up memory allocation client/completion_hash.h: Speed up memory allocation client/mysql.cc: Speed up memory allocation client/mysqldump.c: Fix to use now convert_dirname client/mysqltest.c: Fixed memory allocation bugs. Added --basedir=#, --compress=#, --server-arg, --server-file. Fixes for embedded version Changed silent mode to -s instead of -q include/my_global.h: Update to use HAVE_ISAM include/my_sys.h: Cleanup of fn_format() include/mysql.h: Prepare FIELD struct for 4.1 include/mysql_embed.h: Don't use ISAM in embedded version innobase/include/srv0srv.h: Make InnoDB startup/shutdown silent in embedded version innobase/log/log0log.c: Make InnoDB startup/shutdown silent in embedded version innobase/srv/srv0srv.c: Make InnoDB startup/shutdown silent in embedded version innobase/srv/srv0start.c: Make InnoDB startup/shutdown silent in embedded version isam/isamlog.c: new convert_dirname libmysql/libmysql.c: Prepare for 4.1 libmysqld/Makefile.am: Changed to create one libmysqld.a file that includes all other libraries. libmysqld/examples/Makefile.am: Changed to use new libmysqld.a libmysqld/examples/test-run: Lot's of fixes to get new mysqltest with embedded MySQL to work. libmysqld/lib_sql.cc: Changed type of arguments for mysql_server_init() to make code more portable. libmysqld/libmysqld.c: Cleanup merge/Makefile.am: Rename to use common prefix. merge/mrg_close.c: Rename to use common prefix. merge/mrg_create.c: Rename to use common prefix. merge/mrg_def.h: Rename to use common prefix. merge/mrg_delete.c: Rename to use common prefix. merge/mrg_extra.c: Rename to use common prefix. merge/mrg_info.c: Rename to use common prefix. merge/mrg_locking.c: Rename to use common prefix. merge/mrg_open.c: Rename to use common prefix. merge/mrg_panic.c: Rename to use common prefix. merge/mrg_rrnd.c: Rename to use common prefix. merge/mrg_rsame.c: Rename to use common prefix. merge/mrg_static.c: Rename to use common prefix. merge/mrg_update.c: Rename to use common prefix. myisam/myisamlog.c: Use new convert_dirname myisammrg/Makefile.am: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_close.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_create.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_def.h: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_delete.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_extra.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_info.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_locking.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_open.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_panic.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_queue.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rfirst.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rkey.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rlast.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rnext.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rprev.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rrnd.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rsame.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_static.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_update.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_write.c: Renamed mymrgdef.h -> myrg_def.h mysql-test/include/master-slave.inc: Use short filenames for sockets (portability problem on Mac OS X) mysql-test/mysql-test-run.sh: cleanup mysql-test/r/auto_increment.result: Cleanup of tests for embedded version mysql-test/r/func_system.result: Cleanup of tests for embedded version mysql-test/r/isam.result: Cleanup of tests for embedded version mysql-test/r/lock.result: Cleanup of tests for embedded version mysql-test/r/show_check.result: Cleanup of tests for embedded version mysql-test/t/auto_increment.test: Cleanup of tests for embedded version mysql-test/t/backup.test: Cleanup of tests for embedded version mysql-test/t/count_distinct2-master.opt: Cleanup of tests for embedded version mysql-test/t/count_distinct2.test: Cleanup of tests for embedded version mysql-test/t/create.test: Cleanup of tests for embedded version mysql-test/t/flush.test: Cleanup of tests for embedded version mysql-test/t/func_system.test: Cleanup of tests for embedded version mysql-test/t/isam.test: Cleanup of tests for embedded version mysql-test/t/kill.test: Cleanup of tests for embedded version mysql-test/t/lock.test: Cleanup of tests for embedded version mysql-test/t/order_fill_sortbuf-master.opt: Cleanup of tests for embedded version mysql-test/t/rpl000015.test: Use short filenames for sockets (portability problem on Mac OS X) mysql-test/t/rpl000016.test: Use short filenames for sockets (portability problem on Mac OS X) mysql-test/t/rpl000017.test: Use short filenames for sockets (portability problem on Mac OS X) mysql-test/t/rpl000018.test: Use short filenames for sockets (portability problem on Mac OS X) mysql-test/t/show_check.test: Move ISAM specific tests to isam.test mysql-test/t/status.test: Cleanup of tests for embedded version mysql-test/t/tablelock.test: Cleanup mysys/Makefile.am: Removed not used mf_pack2.c mysys/charset.c: new convert_dirname mysys/default.c: new convert_dirname mysys/mf_dirname.c: Changed convert_dirname() to be more general mysys/mf_format.c: Changed bit flags to fn_format() to defines. Added handling of relative filenames BitKeeper/etc/ignore: Added libmysqld/examples/test-gdbinit scripts/mysql_explain_log to the ignore list mysys/mf_pack.c: new convert_dirname mysys/mf_tempfile.c: new convert_dirname scripts/Makefile.am: Adde mysql_explain_log scripts/mysql_config.sh: Added support of --libmysqld-libs sql/Makefile.am: Fix to use 'innodb_system_libs' sql/ha_innobase.cc: Make InnoDB startup/shutdown silent in embedded version sql/ha_isam.cc: Added handling of HAVE_ISAM sql/ha_isammrg.cc: Added handling of HAVE_ISAM sql/ha_myisam.cc: Handle relative paths; Needed to support BACKUP TABLE in embedded version sql/ha_myisammrg.cc: Rename of filenames sql/handler.cc: Added handling of HAVE_ISAM sql/item_func.cc: Fix for ecc (Intel Compiler) sql/mysql_priv.h: Added global variable 'mysql_embedded' sql/mysqld.cc: Use HAVE_ISAM sql/sql_parse.cc: Use new convert_dirname sql/sql_select.cc: Fix for ecc (Intel Compiler) sql/sql_table.cc: Added handling of relative filenames strings/Makefile.am: Don't compile both assembler and C functions on x86 strings/bchange.c: cleanup
138 lines
3.5 KiB
Bash
Executable File
138 lines
3.5 KiB
Bash
Executable File
#! /bin/sh
|
|
|
|
# This is slapped together as a quick way to run the tests and
|
|
# is not meant for prime time. Please hack at it and submit
|
|
# changes, though, so we can gradually turn it into something
|
|
# that will run on all platforms (or incorporate it into the
|
|
# standard mysql-test-run).
|
|
|
|
# All paths below must be relative to $test_data_dir
|
|
top_builddir=../..
|
|
mysql_test_dir=$top_builddir/mysql-test
|
|
examples=$top_builddir/libmysqld/examples
|
|
mysqltest=$examples/mysqltest
|
|
datadir=$mysql_test_dir/var/master-data
|
|
test_data_dir=test
|
|
gdb=0
|
|
list=0
|
|
run=
|
|
tests=
|
|
start=
|
|
clean=1
|
|
|
|
cr="
|
|
"
|
|
er="\b\b\b\b\b\b\b\b"
|
|
|
|
usage () {
|
|
cat <<EOF
|
|
usage: $0 [-g|-h|-r] [test-name ...]
|
|
|
|
-C | --noclean Do not remove old innodb and bdb files at start.
|
|
-g | --gdb run $mysqltest in gdb
|
|
-h | --help show this help
|
|
-l | --list ) list all available tests
|
|
-r | --run automatically 'run' program in gdb
|
|
-s t | --start=t start with test t (skip all tests before t)
|
|
EOF
|
|
}
|
|
|
|
init_args=""
|
|
while test $# -gt 0
|
|
do
|
|
arg=
|
|
argset=0
|
|
case "$1" in
|
|
--?*=* ) arg=`echo "$1" | sed -e 's,^[^=][^=]*=,,'`; argset=1 ;;
|
|
esac
|
|
|
|
case "$1" in
|
|
-g | --gdb ) gdb=1; shift;;
|
|
-h | --help | -\? ) usage; exit 0;;
|
|
-l | --list ) list=1 ; shift ;;
|
|
-r | --run ) run="${cr}run"; shift;;
|
|
--debug) init_args="$init_args --debug" ; shift ;;
|
|
-C | --noclean) clean=0 ; shift ;;
|
|
-s | --start=* )
|
|
test $argset -eq 0 && { shift; arg="$1"; }
|
|
start="$arg"
|
|
shift
|
|
;;
|
|
-* ) usage; exit 1;;
|
|
* ) tests="$tests $1"; shift;;
|
|
esac
|
|
done
|
|
|
|
if test ! -d "$datadir/$test_data_dir"
|
|
then
|
|
echo "bad setup (is '$datadir/$test_data_dir'', missing ?)" >&2
|
|
exit 1
|
|
fi
|
|
|
|
test -n "$tests" ||
|
|
tests=`/bin/ls -1 "$mysql_test_dir"/t/*.test | grep -v '^.*/rpl[^/]*$' | \
|
|
sed -e 's,^.*/,,' -e 's,.test$,,'`
|
|
|
|
echo "cleaning data directory '$datadir/$test_data_dir'"
|
|
if test $clean = 1
|
|
then
|
|
rm -f $datadir/ib_* $datadir/ibdata*
|
|
rm -f $datadir/log.00*
|
|
fi
|
|
rm -f $datadir/../tmp/*
|
|
rm -f test-gdbinit
|
|
|
|
TZ=GMT-3; export TZ
|
|
|
|
# At least one of the tests needs the following environment variable
|
|
MYSQL_TEST_DIR=`( cd $mysql_test_dir ; pwd )` ; export MYSQL_TEST_DIR
|
|
|
|
skip=1
|
|
test -z "$start" && skip=0
|
|
|
|
for b in $tests
|
|
do
|
|
test $list -eq 1 && { echo " $b"; continue; }
|
|
test $skip -eq 1 && test -n "$start" && test "$start" = "$b" && skip=0
|
|
test $skip -eq 1 && { echo "skipping '$b'"; continue; }
|
|
|
|
t="t/$b.test"
|
|
r="r/$b.result"
|
|
|
|
# Only test if $t exists; there is no $r for some tests
|
|
test -f $mysql_test_dir/$t || {
|
|
echo "test '$mysql_test_dir/$t' doesn't exist" >&2
|
|
continue
|
|
}
|
|
args="$init_args -v --basedir=$mysql_test_dir/ -R $r -x $t --server-arg=--datadir=$datadir"
|
|
if test -f "$mysql_test_dir/t/$b-master.opt" ; then
|
|
args="$args --server-file=t/$b-master.opt"
|
|
fi
|
|
|
|
args="$args $test_data_dir" # Add database last
|
|
echo "set args $args$run" > test-gdbinit
|
|
#if false && test -n "$run"
|
|
if test -n "$run" -o $gdb -eq 1
|
|
then
|
|
echo -e "$er>>> $b"
|
|
else
|
|
echo -e "$er>>> $b> \c"
|
|
read junk
|
|
fi
|
|
if test $gdb -eq 1
|
|
then
|
|
if [ -x "$top_builddir/libtool" ]; then
|
|
$top_builddir/libtool gdb -x test-gdbinit -q $mysqltest
|
|
else
|
|
gdb -x test-gdbinit -q $mysqltest
|
|
fi
|
|
res=$?
|
|
rm -f test-gdbinit
|
|
else
|
|
$mysqltest $args
|
|
res=$?
|
|
fi
|
|
|
|
test $res -eq 0 -o $res -eq 2 || echo "!!! error: $res"
|
|
done
|