Commit c323e60c authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-5.1-clean 

into  mysql.com:/home/jimw/my/mysql-5.1-kill-sql-bench


Makefile.am:
  Resolve conflict
configure.in:
  Resolve conflict
parents e2f724a8 0544ed42

BUILD/test-alpha-ccc

deleted100755 → 0
+0 −11
Original line number Diff line number Diff line 
cd /usr/local/mysql

bin/mysqladmin shutdown

libexec/mysqld --basedir . &

cd sql-bench

rm output/*

perl run-all-tests --comment "Alpha DS20 2x500 MHz, 2G memory, key_buffer=16M; egcs 1.1.2 + ccc" --user=monty --password="ds20-gryta"

perl run-all-tests --comment "Alpha DS20 2x500 MHz, 2G memory, key_buffer=16M; egcs 1.1.2 + ccc" --user=monty --password="ds20-gryta" --log --use-old

mv output/* output-ccc

perl run-all-tests --comment "Alpha DS20 2x500 MHz, 2G memory, key_buffer=16M; egcs 1.1.2 + ccc" --user=monty --password="ds20-gryta" --fast

perl run-all-tests --comment "Alpha DS20 2x500 MHz, 2G memory, key_buffer=16M; egcs 1.1.2 + ccc" --user=monty --password="ds20-gryta" --log --use-old --fast

mv output/* output-ccc

Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ 
			@sql_server@ scripts @man_dirs@ tests \

			@mysql_se_plugins@ \

			netware @libmysqld_dirs@ \

			@bench_dirs@ support-files @tools_dirs@ \

			mysql-test support-files @tools_dirs@ \

			plugin unittest win



DIST_SUBDIRS =		$(SUBDIRS) BUILD

VC++Files/copy_mysql_files.bat

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ REM Copy share, docs etc 
xcopy share\*.* c:\mysql\share /E /Y

xcopy scripts\*.* c:\mysql\scripts /E /Y

xcopy docs\*.* c:\mysql\docs /E /Y

xcopy sql-bench\*.* c:\mysql\bench /E /Y

copy docs\readme c:\mysql\



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

configure.in

+0 −20
Original line number Diff line number Diff line
@@ -2288,26 +2288,6 @@ fi 
AC_SUBST(man_dirs)

AC_SUBST(man1_files)



if test -e sql-bench

then

# Shall we build the bench code?

AC_ARG_WITH(bench,

    [  --without-bench         Skip building of the benchmark suite.],

    [with_bench=$withval],

    [with_bench=yes]

)

fi



if test "$with_bench" = "yes"

then

  bench_dirs="sql-bench"

  AC_CONFIG_FILES(sql-bench/Makefile)

else

  bench_dirs=""

fi

bench_dirs="$bench_dirs mysql-test"

AC_SUBST(bench_dirs)



# Don't build readline, i have it already

AC_ARG_WITH(readline,

    [  --without-readline      Use system readline instead of bundled copy.],

mysql-test/mysql-test-run.pl

+6 −3
Original line number Diff line number Diff line
@@ -502,7 +502,9 @@ sub initial_setup () { 
    chomp($glob_cygwin_shell);

  }

  $glob_basedir=         dirname($glob_mysql_test_dir);

  $glob_mysql_bench_dir= "$glob_basedir/mysql-bench"; # FIXME make configurable

  # Expect mysql-bench to be located adjacent to the source tree, by default

  $glob_mysql_bench_dir= "$glob_basedir/../mysql-bench"

    unless defined $glob_mysql_bench_dir;



  # needs to be same length to test logging (FIXME what???)

  $path_slave_load_tmpdir=  "../../var/tmp";
@@ -664,6 +666,7 @@ sub command_line_setup () { 
	     # Directories

             'tmpdir=s'                 => \$opt_tmpdir,

             'vardir=s'                 => \$opt_vardir,

             'benchdir=s'               => \$glob_mysql_bench_dir,



             # Misc

             'comment=s'                => \$opt_comment,
@@ -1682,8 +1685,8 @@ sub run_benchmarks ($) { 
    mtr_add_arg($args, "--create-options=TYPE=ndb");

  }



  my $benchdir=  "$glob_basedir/sql-bench";

  chdir($benchdir);             # FIXME check error

  chdir($glob_mysql_bench_dir)

    or mtr_error("Couldn't chdir to '$glob_mysql_bench_dir': $!");



  # FIXME write shorter....