Commit d0a7c124 authored by unknown's avatar unknown

mysql-test-run.pl:

  Corrected path to 'mysql_fix_privilege_tables'
  Corrected dummy --manager-port to take integer argument


mysql-test/mysql-test-run.pl:
  Corrected path to 'mysql_fix_privilege_tables'
parent 34dc6ac3
...@@ -445,9 +445,9 @@ sub command_line_setup () { ...@@ -445,9 +445,9 @@ sub command_line_setup () {
# These are defaults for things that are set on the command line # These are defaults for things that are set on the command line
$opt_suite= "main"; # Special default suite $opt_suite= "main"; # Special default suite
my $opt_master_myport= 9306; my $opt_master_myport= 9306;
my $opt_slave_myport= 9308; my $opt_slave_myport= 9308;
$opt_ndbcluster_port= 9350; $opt_ndbcluster_port= 9350;
# Read the command line # Read the command line
# Note: Keep list, and the order, in sync with usage at end of this file # Note: Keep list, and the order, in sync with usage at end of this file
...@@ -458,7 +458,7 @@ sub command_line_setup () { ...@@ -458,7 +458,7 @@ sub command_line_setup () {
'ps-protocol' => \$opt_ps_protocol, 'ps-protocol' => \$opt_ps_protocol,
'bench' => \$opt_bench, 'bench' => \$opt_bench,
'small-bench' => \$opt_small_bench, 'small-bench' => \$opt_small_bench,
'no-manager' => \$opt_no_manager, 'no-manager' => \$opt_no_manager, # Currently not used
# Control what test suites or cases to run # Control what test suites or cases to run
'force' => \$opt_force, 'force' => \$opt_force,
...@@ -472,7 +472,7 @@ sub command_line_setup () { ...@@ -472,7 +472,7 @@ sub command_line_setup () {
'master_port=i' => \$opt_master_myport, 'master_port=i' => \$opt_master_myport,
'slave_port=i' => \$opt_slave_myport, 'slave_port=i' => \$opt_slave_myport,
'ndbcluster_port=i' => \$opt_ndbcluster_port, 'ndbcluster_port=i' => \$opt_ndbcluster_port,
'manager-port' => \$opt_manager_port, 'manager-port=i' => \$opt_manager_port, # Currently not used
# Test case authoring # Test case authoring
'record' => \$opt_record, 'record' => \$opt_record,
...@@ -840,7 +840,7 @@ sub executable_setup () { ...@@ -840,7 +840,7 @@ sub executable_setup () {
$exe_mysqlbinlog= "$path_client_bindir/mysqlbinlog"; $exe_mysqlbinlog= "$path_client_bindir/mysqlbinlog";
$exe_mysqladmin= "$path_client_bindir/mysqladmin"; $exe_mysqladmin= "$path_client_bindir/mysqladmin";
$exe_mysql= "$path_client_bindir/mysql"; $exe_mysql= "$path_client_bindir/mysql";
$exe_mysql_fix_system_tables= "$path_client_bindir/scripts/mysql_fix_privilege_tables"; $exe_mysql_fix_system_tables= "$glob_basedir/scripts/mysql_fix_privilege_tables";
if ( -d "$glob_basedir/share/mysql/english" ) if ( -d "$glob_basedir/share/mysql/english" )
{ {
...@@ -2219,7 +2219,8 @@ Options that specify ports ...@@ -2219,7 +2219,8 @@ Options that specify ports
master_port=PORT Specify the port number used by the first master master_port=PORT Specify the port number used by the first master
slave_port=PORT Specify the port number used by the first slave slave_port=PORT Specify the port number used by the first slave
ndbcluster_port=i Specify the port number used by cluster FIXME ndbcluster_port=PORT Specify the port number used by cluster
manager-port=PORT Specify the port number used by manager (currently not used)
Options for test case authoring Options for test case authoring
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment