2980 Bjorn Munch 2011-02-07
Bug #59979 Add mtr option to run debug server, but without turning on debug
Added --debug-server and use $opt_debug_server where appropriate
Let --debug imply --debug-server
When merging to 5.5, must adapt fix for 59148
Oops, set debug => debug-server too late, fixed
modified:
mysql-test/mysql-test-run.pl
2979 Bjorn Munch 2011-02-04 [merge]
merge from 5.1 main
added:
mysql-test/extra/rpl_tests/rpl_insert_duplicate.test
mysql-test/suite/innodb/r/innodb_bug30423.result
mysql-test/suite/innodb/t/innodb_bug30423.test
mysql-test/suite/innodb_plugin/r/innodb_bug30423.result
mysql-test/suite/innodb_plugin/t/innodb_bug30423.test
mysql-test/suite/rpl/r/rpl_insert_duplicate.result
mysql-test/suite/rpl/t/rpl_insert_duplicate.test
modified:
configure.in
include/config-win.h
include/my_time.h
mysql-test/extra/rpl_tests/rpl_insert_ignore.test
mysql-test/include/commit.inc
mysql-test/include/gis_keys.inc
mysql-test/r/commit_1innodb.result
mysql-test/r/csv_not_null.result
mysql-test/r/func_time.result
mysql-test/r/gis.result
mysql-test/r/not_embedded_server.result
mysql-test/r/range.result
mysql-test/suite/innodb/r/innodb_gis.result
mysql-test/suite/innodb/t/innodb_bug56143.test
mysql-test/suite/innodb_plugin/r/innodb_gis.result
mysql-test/suite/innodb_plugin/t/innodb_bug56143.test
mysql-test/suite/rpl/r/rpl_insert_ignore.result
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl/t/rpl_insert_ignore.test
mysql-test/t/csv_not_null.test
mysql-test/t/func_time.test
mysql-test/t/not_embedded_server.test
mysql-test/t/range.test
mysql-test/t/variables.test
regex/my_regex.h
regex/regcomp.c
regex/reginit.c
sql-common/my_time.c
sql/field.cc
sql/mysqld.cc
sql/set_var.cc
sql/sql_class.h
sql/sql_insert.cc
sql/sql_repl.cc
sql/sql_select.cc
storage/innobase/btr/btr0cur.c
storage/innobase/dict/dict0dict.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/include/btr0cur.h
storage/innobase/include/dict0mem.h
storage/innobase/include/dict0types.h
storage/innobase/include/rem0cmp.h
storage/innobase/include/rem0cmp.ic
storage/innobase/include/srv0srv.h
storage/innobase/include/sync0rw.h
storage/innobase/include/trx0rseg.h
storage/innobase/include/trx0trx.h
storage/innobase/rem/rem0cmp.c
storage/innobase/row/row0vers.c
storage/innobase/srv/srv0srv.c
storage/innobase/sync/sync0arr.c
storage/innobase/sync/sync0rw.c
storage/innobase/trx/trx0trx.c
storage/innodb_plugin/ChangeLog
storage/innodb_plugin/btr/btr0btr.c
storage/innodb_plugin/btr/btr0cur.c
storage/innodb_plugin/btr/btr0sea.c
storage/innodb_plugin/buf/buf0buddy.c
storage/innodb_plugin/buf/buf0buf.c
storage/innodb_plugin/buf/buf0lru.c
storage/innodb_plugin/dict/dict0dict.c
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/include/btr0cur.h
storage/innodb_plugin/include/buf0buf.h
storage/innodb_plugin/include/buf0buf.ic
storage/innodb_plugin/include/buf0lru.h
storage/innodb_plugin/include/dict0mem.h
storage/innodb_plugin/include/dict0types.h
storage/innodb_plugin/include/rem0cmp.h
storage/innodb_plugin/include/rem0cmp.ic
storage/innodb_plugin/include/srv0srv.h
storage/innodb_plugin/include/sync0rw.h
storage/innodb_plugin/include/trx0rseg.h
storage/innodb_plugin/include/trx0trx.h
storage/innodb_plugin/include/univ.i
storage/innodb_plugin/mem/mem0mem.c
storage/innodb_plugin/mtr/mtr0log.c
storage/innodb_plugin/page/page0zip.c
storage/innodb_plugin/rem/rem0cmp.c
storage/innodb_plugin/row/row0upd.c
storage/innodb_plugin/row/row0vers.c
storage/innodb_plugin/srv/srv0srv.c
storage/innodb_plugin/sync/sync0arr.c
storage/innodb_plugin/sync/sync0rw.c
storage/innodb_plugin/trx/trx0trx.c
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl 2011-02-04 11:33:45 +0000
+++ b/mysql-test/mysql-test-run.pl 2011-02-07 11:42:21 +0000
@@ -182,6 +182,7 @@ my $opt_cursor_protocol;
my $opt_view_protocol;
our $opt_debug;
+our $opt_debug_server;
our @opt_cases; # The test cases names in argv
our $opt_embedded_server;
@@ -936,6 +937,7 @@ sub command_line_setup {
# Debugging
'debug' => \$opt_debug,
+ 'debug-server' => \$opt_debug_server,
'gdb' => \$opt_gdb,
'client-gdb' => \$opt_client_gdb,
'manual-gdb' => \$opt_manual_gdb,
@@ -1082,6 +1084,9 @@ sub command_line_setup {
my $path_share= dirname($path_language);
$path_charsetsdir= mtr_path_exists("$path_share/charsets");
+ # --debug implies we run debug server
+ $opt_debug_server= 1 if $opt_debug;
+
if (using_extern())
{
# Connect to the running mysqld and find out what it supports
@@ -1712,7 +1717,7 @@ sub find_mysqld {
my @mysqld_names= ("mysqld", "mysqld-max-nt", "mysqld-max",
"mysqld-nt");
- if ( $opt_debug ){
+ if ( $opt_debug_server ){
# Put mysqld-debug first in the list of binaries to look for
mtr_verbose("Adding mysqld-debug first in list of binaries to look for");
unshift(@mysqld_names, "mysqld-debug");
@@ -2402,9 +2407,9 @@ sub check_debug_support ($) {
#mtr_report(" - binaries are not debug compiled");
$debug_compiled_binaries= 0;
- if ( $opt_debug )
+ if ( $opt_debug_server )
{
- mtr_error("Can't use --debug, binaries does not support it");
+ mtr_error("Can't use --debug[-server], binary does not support it");
}
return;
}
@@ -5582,6 +5587,8 @@ Options for debugging the product
client-gdb Start mysqltest client in gdb
ddd Start mysqld in ddd
debug Dump trace output for all servers and client programs
+ debug-server Use debug version of server, but without turning on
+ tracing
debugger=NAME Start mysqld in the selected debugger
gdb Start the mysqld(s) in gdb
manual-debug Let user manually start mysqld in debugger, before
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.1-mtr branch (bjorn.munch:2979 to 2980) Bug#59979 | Bjorn Munch | 7 Feb |
