database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-07 06:01:31 +03:00
Code Activity

Rename "snapshot_setup" to "datadir_setup" as that is what is done by it.

Browse Source 
Move call f dunction into "initialize_servers" so it's called also
in stress and bench mode
This commit is contained in:
msvensson@neptunus.(none)
2006-10-06 01:22:33 +02:00
parent ae4df31df4
commit f638be87cb
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/mysql-test-run.pl
View File

@ -323,7 +323,7 @@ our $default_mysqld_port;
sub main (); sub main ();
sub initial_setup (); sub initial_setup ();
sub command_line_setup (); sub command_line_setup ();
sub snapshot_setup (); sub datadir_setup ();
sub executable_setup (); sub executable_setup ();
sub environment_setup (); sub environment_setup ();
sub kill_running_server (); sub kill_running_server ();
@ -416,7 +416,6 @@ sub main () {
unless $need_ndbcluster; unless $need_ndbcluster;
$opt_skip_im= 1 unless $need_im; $opt_skip_im= 1 unless $need_im;
snapshot_setup();
initialize_servers(); initialize_servers();
run_suite($opt_suite, $tests); run_suite($opt_suite, $tests);
@ -1122,7 +1121,7 @@ sub command_line_setup () {
$path_snapshot= "$opt_tmpdir/snapshot_$opt_master_myport/"; $path_snapshot= "$opt_tmpdir/snapshot_$opt_master_myport/";
} }
sub snapshot_setup () { sub datadir_setup () {
# Make a list of all data_dirs # Make a list of all data_dirs
@data_dir_lst = ( @data_dir_lst = (
@ -2370,6 +2369,9 @@ sub run_suite () {
############################################################################## ##############################################################################
sub initialize_servers () { sub initialize_servers () {
datadir_setup();
if ( ! $glob_use_running_server ) if ( ! $glob_use_running_server )
{ {
kill_running_server(); kill_running_server();