Merge branch '10.1' into 10.2

2 files changed, 13 insertions, 3 deletions

diff --git a/mysql-test/lib/My/CoreDump.pm b/mysql-test/lib/My/CoreDump.pm
index f9f7b3d8d4b..a421d51ec98 100644
--- a/mysql-test/lib/My/CoreDump.pm
+++ b/mysql-test/lib/My/CoreDump.pm
@@ -53,9 +53,19 @@ sub _verify_binpath {
 sub _gdb {
   my ($core_name)= @_;
 
-  print "\nTrying 'gdb' to get a backtrace\n";
+  # Check that gdb exists
+  `gdb --version`;
+  if ($?) {
+    print "gdb not found, cannot get the stack trace\n";
+    return;
+  }
 
-  return unless -f $core_name;
+  if (-f $core_name) {
+    print "\nTrying 'gdb' to get a backtrace from coredump $core_name\n";
+  } else {
+    print "\nCoredump $core_name does not exist, cannot run 'gdb'\n";
+    return;
+  }
 
   # Find out name of binary that generated core
   `gdb -c '$core_name' --batch 2>&1` =~
diff --git a/mysql-test/lib/generate-ssl-certs.sh b/mysql-test/lib/generate-ssl-certs.sh
index 5dca21a755d..cc919dfe32e 100755
--- a/mysql-test/lib/generate-ssl-certs.sh
+++ b/mysql-test/lib/generate-ssl-certs.sh
@@ -1,4 +1,4 @@
-#/bin/sh -xe
+#!/bin/sh -xe
 
 # simply run me from mysql-test/
 cd std_data/