mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint mysql-test/mysql-test-run.pl: Auto merged scripts/mysql_install_db.sh: Auto merged scripts/mysql_system_tables.sql: Manual merge scripts/mysql_system_tables_data.sql: Manual merge
This commit is contained in:
@@ -571,6 +571,7 @@ sub command_line_setup () {
|
||||
'manual-debug' => \$opt_manual_debug,
|
||||
'ddd' => \$opt_ddd,
|
||||
'client-ddd' => \$opt_client_ddd,
|
||||
'manual-ddd' => \$opt_manual_ddd,
|
||||
'debugger=s' => \$opt_debugger,
|
||||
'client-debugger=s' => \$opt_client_debugger,
|
||||
'strace-client' => \$opt_strace_client,
|
||||
@@ -4847,8 +4848,7 @@ sub gdb_arguments {
|
||||
if ( $opt_manual_gdb )
|
||||
{
|
||||
print "\nTo start gdb for $type, type in another window:\n";
|
||||
print "cd $glob_mysql_test_dir;\n";
|
||||
print "gdb -x $gdb_init_file $$exe\n";
|
||||
print "gdb -cd $glob_mysql_test_dir -x $gdb_init_file $$exe\n";
|
||||
|
||||
# Indicate the exe should not be started
|
||||
$$exe= undef;
|
||||
@@ -4912,8 +4912,7 @@ sub ddd_arguments {
|
||||
if ( $opt_manual_ddd )
|
||||
{
|
||||
print "\nTo start ddd for $type, type in another window:\n";
|
||||
print "cd $glob_mysql_test_dir;\n";
|
||||
print "ddd -x $gdb_init_file $$exe\n";
|
||||
print "ddd -cd $glob_mysql_test_dir -x $gdb_init_file $$exe\n";
|
||||
|
||||
# Indicate the exe should not be started
|
||||
$$exe= undef;
|
||||
@@ -5132,6 +5131,8 @@ Options for debugging the product
|
||||
running test(s)
|
||||
manual-gdb Let user manually start mysqld in gdb, before running
|
||||
test(s)
|
||||
manual-ddd Let user manually start mysqld in ddd, before running
|
||||
test(s)
|
||||
master-binary=PATH Specify the master "mysqld" to use
|
||||
slave-binary=PATH Specify the slave "mysqld" to use
|
||||
strace-client Create strace output for mysqltest client
|
||||
|
||||
Reference in New Issue
Block a user