Skip to content

Commit f812f8e

Browse files
committed
MDEV-30475 Windows, mtr - Remove outdated instructions on how to install post-mortem debugger
Also, use standard C:\symbols location for OS debugging symbols cache, rather than own invention C:\cdb_symbols.
1 parent 895673d commit f812f8e

File tree

1 file changed

+3
-30
lines changed

1 file changed

+3
-30
lines changed

mysql-test/lib/My/CoreDump.pm

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -310,16 +310,8 @@ sub cdb_check {
310310
`cdb -? 2>&1`;
311311
if ($? >> 8)
312312
{
313-
print "Cannot find cdb. Please Install Debugging tools for Windows\n";
314-
print "from http://www.microsoft.com/whdc/devtools/debugging/";
315-
if($ENV{'ProgramW6432'})
316-
{
317-
print "install64bit.mspx (native x64 version)\n";
318-
}
319-
else
320-
{
321-
print "installx86.mspx\n";
322-
}
313+
print "Cannot find the cdb debugger. Please install Debugging tools for Windows\n";
314+
print "and set PATH environment variable to include location of cdb.exe";
323315
}
324316
}
325317

@@ -328,25 +320,6 @@ sub _cdb {
328320
my ($core_name, $format)= @_;
329321
print "\nTrying 'cdb' to get a backtrace\n";
330322
return unless -f $core_name;
331-
332-
# Try to set environment for debugging tools for Windows
333-
if ($ENV{'PATH'} !~ /Debugging Tools/)
334-
{
335-
if ($ENV{'ProgramW6432'})
336-
{
337-
# On x64 computer
338-
$ENV{'PATH'}.= ";".$ENV{'ProgramW6432'}."\\Debugging Tools For Windows (x64)";
339-
}
340-
else
341-
{
342-
# On x86 computer. Newest versions of Debugging tools are installed in the
343-
# directory with (x86) suffix, older versions did not have this suffix.
344-
$ENV{'PATH'}.= ";".$ENV{'ProgramFiles'}."\\Debugging Tools For Windows (x86)";
345-
$ENV{'PATH'}.= ";".$ENV{'ProgramFiles'}."\\Debugging Tools For Windows";
346-
}
347-
}
348-
349-
350323
# Read module list, find out the name of executable and
351324
# build symbol path (required by cdb if executable was built on
352325
# different machine)
@@ -384,7 +357,7 @@ sub _cdb {
384357
if (!$ENV{'_NT_SYMBOL_PATH'})
385358
{
386359
my $windir= $ENV{'windir'};
387-
my $symbol_cache= substr($windir ,0, index($windir,'\\'))."\\cdb_symbols";
360+
my $symbol_cache= substr($windir ,0, index($windir,'\\'))."\\symbols";
388361

389362
print "OS debug symbols will be downloaded and stored in $symbol_cache.\n";
390363
print "You can control the location of symbol cache with _NT_SYMBOL_PATH\n";

0 commit comments

Comments
 (0)