Skip to content

Commit 55727ef

Browse files
author
[email protected]
committed
Remove sql-bench from the server repository -- it is being maintained
in a distinct mysql-bench repository. Also add a new --benchdir option to mysql-test-run.pl so the location of the mysql-bench repository can be specified. The default location is adjacent to the source tree.
1 parent 86d6b16 commit 55727ef

443 files changed

Lines changed: 23 additions & 77255 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎BUILD/test-alpha-ccc‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎Makefile.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
2828
@sql_server@ scripts @man_dirs@ tests \
2929
@mysql_se_plugins@ \
3030
netware @libmysqld_dirs@ \
31-
@bench_dirs@ support-files @tools_dirs@ \
31+
mysql-test support-files @tools_dirs@ \
3232
plugin win
3333

3434
DIST_SUBDIRS = . include @docs_dirs@ zlib \
@@ -38,7 +38,7 @@ DIST_SUBDIRS = . include @docs_dirs@ zlib \
3838
vio sql libmysql_r libmysql client scripts \
3939
@man_dirs@ tests \
4040
BUILD netware @libmysqld_dirs@\
41-
@bench_dirs@ support-files server-tools \
41+
support-files server-tools \
4242
plugin win
4343

4444
# Run these targets before any others, also make part of clean target,

‎VC++Files/copy_mysql_files.bat‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ REM Copy share, docs etc
7171
xcopy share\*.* c:\mysql\share /E /Y
7272
xcopy scripts\*.* c:\mysql\scripts /E /Y
7373
xcopy docs\*.* c:\mysql\docs /E /Y
74-
xcopy sql-bench\*.* c:\mysql\bench /E /Y
7574
copy docs\readme c:\mysql\
7675

7776
REM Copy privilege tables (Delete old ones as they may be from a newer version)

‎configure.in‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2288,22 +2288,6 @@ fi
22882288
AC_SUBST(man_dirs)
22892289
AC_SUBST(man1_files)
22902290

2291-
# Shall we build the bench code?
2292-
AC_ARG_WITH(bench,
2293-
[ --without-bench Skip building of the benchmark suite.],
2294-
[with_bench=$withval],
2295-
[with_bench=yes]
2296-
)
2297-
2298-
if test "$with_bench" = "yes"
2299-
then
2300-
bench_dirs="sql-bench"
2301-
else
2302-
bench_dirs=""
2303-
fi
2304-
bench_dirs="$bench_dirs mysql-test"
2305-
AC_SUBST(bench_dirs)
2306-
23072291
# Don't build readline, i have it already
23082292
AC_ARG_WITH(readline,
23092293
[ --without-readline Use system readline instead of bundled copy.],
@@ -2593,7 +2577,7 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
25932577
pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile dnl
25942578
sql/handlerton.cc sql-common/Makefile dnl
25952579
dbug/Makefile scripts/Makefile dnl
2596-
include/Makefile sql-bench/Makefile dnl
2580+
include/Makefile dnl
25972581
server-tools/Makefile server-tools/instance-manager/Makefile dnl
25982582
tests/Makefile Docs/Makefile support-files/Makefile dnl
25992583
support-files/MacOSX/Makefile mysql-test/Makefile dnl

‎mysql-test/mysql-test-run.pl‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,9 @@ ()
502502
chomp($glob_cygwin_shell);
503503
}
504504
$glob_basedir= dirname($glob_mysql_test_dir);
505-
$glob_mysql_bench_dir= "$glob_basedir/mysql-bench"; # FIXME make configurable
505+
# Expect mysql-bench to be located adjacent to the source tree, by default
506+
$glob_mysql_bench_dir= "$glob_basedir/../mysql-bench"
507+
unless defined $glob_mysql_bench_dir;
506508

507509
# needs to be same length to test logging (FIXME what???)
508510
$path_slave_load_tmpdir= "../../var/tmp";
@@ -664,6 +666,7 @@ ()
664666
# Directories
665667
'tmpdir=s' => \$opt_tmpdir,
666668
'vardir=s' => \$opt_vardir,
669+
'benchdir=s' => \$glob_mysql_bench_dir,
667670

668671
# Misc
669672
'comment=s' => \$opt_comment,
@@ -1682,8 +1685,8 @@ ($)
16821685
mtr_add_arg($args, "--create-options=TYPE=ndb");
16831686
}
16841687

1685-
my $benchdir= "$glob_basedir/sql-bench";
1686-
chdir($benchdir); # FIXME check error
1688+
chdir($glob_mysql_bench_dir)
1689+
or mtr_error("Couldn't chdir to '$glob_mysql_bench_dir': $!");
16871690

16881691
# FIXME write shorter....
16891692

‎scripts/make_binary_distribution.sh‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ mkdir $BASE $BASE/bin $BASE/docs \
9797
$BASE/mysql-test/extra/binlog_tests $BASE/mysql-test/extra/rpl_tests
9898

9999
if [ $BASE_SYSTEM != "netware" ] ; then
100-
mkdir $BASE/share/mysql $BASE/tests $BASE/sql-bench $BASE/man \
100+
mkdir $BASE/share/mysql $BASE/tests $BASE/man \
101101
$BASE/man/man1 $BASE/data $BASE/data/mysql $BASE/data/test
102102

103103
chmod o-rwx $BASE/data $BASE/data/*
@@ -263,8 +263,7 @@ if [ $BASE_SYSTEM != "netware" ] ; then
263263
mv $BASE/support-files/binary-configure $BASE/configure
264264
chmod a+x $BASE/bin/* $BASE/scripts/* $BASE/support-files/mysql-* \
265265
$BASE/support-files/mysql.server $BASE/configure
266-
$CP -r sql-bench/* $BASE/sql-bench
267-
rm -f $BASE/sql-bench/*.sh $BASE/sql-bench/Makefile* $BASE/lib/*.la
266+
rm -f $BASE/lib/*.la
268267
rm -f $BASE/bin/*.sql
269268
fi
270269

@@ -304,17 +303,9 @@ else
304303
rm -f $BASE/README.NW
305304
fi
306305

307-
# Dropped with 5.1.6-beta
308-
# # Make safe_mysqld a symlink to mysqld_safe for backwards portability
309-
# # To be removed in MySQL 4.1
310-
# if [ $BASE_SYSTEM != "netware" ] ; then
311-
# (cd $BASE/bin ; ln -s mysqld_safe safe_mysqld )
312-
# fi
313-
314306
# Clean up if we did this from a bk tree
315-
if [ -d $BASE/sql-bench/SCCS ] ; then
307+
if [ -d $BASE/share/SCCS ] ; then
316308
find $BASE/share -name SCCS -print | xargs rm -rf
317-
find $BASE/sql-bench -name SCCS -print | xargs rm -rf
318309
fi
319310

320311
# NDB Cluster

‎scripts/make_win_src_distribution.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ done
314314
# Raw dirs from source tree
315315
#
316316

317-
for i in scripts sql-bench mysql-test SSL tests
317+
for i in scripts mysql-test SSL tests
318318
do
319319
print_debug "Copying directory '$i'"
320320
if [ -d $i ]

‎scripts/mysql_install_db.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,9 +262,6 @@ then
262262
echo "You can start the MySQL daemon with:"
263263
echo "cd @prefix@ ; $bindir/mysqld_safe &"
264264
echo
265-
echo "You can test the MySQL daemon with the benchmarks in the 'sql-bench' directory:"
266-
echo "cd sql-bench ; perl run-all-tests"
267-
echo
268265
fi
269266
echo "Please report any problems with the @scriptdir@/mysqlbug script!"
270267
echo

‎sql-bench/.cvsignore‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎sql-bench/ChangeLog‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)