diff options
| author | dkatz@damien-katzs-computer.local <> | 2007-12-20 15:32:56 -0500 |
|---|---|---|
| committer | dkatz@damien-katzs-computer.local <> | 2007-12-20 15:32:56 -0500 |
| commit | 4b8c6e49134215369f6bfe1b880136b3beafe2a5 (patch) | |
| tree | 92e3d82dd75fb199d8fd542a7183cb2ac5bdd080 | |
| parent | dfe685e6fc5b1ff0a74a1868d7299122b6af017b (diff) | |
| download | mariadb-git-4b8c6e49134215369f6bfe1b880136b3beafe2a5.tar.gz | |
Bug #29836 enable-pstack option appears even if --with-pstack is disabled
Placed all pstack code inside of #ifdef's, so the options aren't displayed when not available.
| -rw-r--r-- | sql/mysqld.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 26daae54384..359e4ec1864 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -607,7 +607,10 @@ char *opt_logname, *opt_slow_logname; /* Static variables */ static bool kill_in_progress, segfaulted; -static my_bool opt_do_pstack, opt_bootstrap, opt_myisam_log; +#ifdef HAVE_STACK_TRACE_ON_SEGV +static my_bool opt_do_pstack; +#endif /* HAVE_STACK_TRACE_ON_SEGV */ +static my_bool opt_bootstrap, opt_myisam_log; static int cleanup_done; static ulong opt_specialflag, opt_myisam_block_size; static char *opt_update_logname, *opt_binlog_index_name; @@ -5485,9 +5488,11 @@ struct my_option my_long_options[] = (uchar**) &opt_enable_named_pipe, (uchar**) &opt_enable_named_pipe, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, #endif +#ifdef HAVE_STACK_TRACE_ON_SEGV {"enable-pstack", OPT_DO_PSTACK, "Print a symbolic stack trace on failure.", (uchar**) &opt_do_pstack, (uchar**) &opt_do_pstack, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, +#endif /* HAVE_STACK_TRACE_ON_SEGV */ {"engine-condition-pushdown", OPT_ENGINE_CONDITION_PUSHDOWN, "Push supported query conditions to the storage engine.", |