summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-11-09 08:26:59 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2021-11-09 08:26:59 +0200
commit524b4a89da3d9143ad72a82d73617ffde9e3a7a8 (patch)
tree4365b284812f3ea742b0d7bb96f2447c3c657b54 /sql/mysqld.cc
parentf7054ff5dfea7b84afdde11c14898cff7154521e (diff)
parentd6d1a1fc21084c81a0795a26e67577c2a718f6ea (diff)
downloadmariadb-git-524b4a89da3d9143ad72a82d73617ffde9e3a7a8.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index a00b3004cc1..575aafa416b 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -9884,7 +9884,6 @@ static int get_options(int *argc_ptr, char ***argv_ptr)
{
/* Allow break with SIGINT, no core or stack trace */
test_flags|= TEST_SIGINT;
- opt_stack_trace= 1;
test_flags&= ~TEST_CORE_ON_SIGNAL;
}
/* Set global MyISAM variables from delay_key_write_options */