diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-10-14 17:51:16 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-10-14 17:51:16 +0200 |
| commit | aed67d25829791d3e3f8dedc83e17179a1043259 (patch) | |
| tree | e2f80bb86ba5e2f155003ba860546396de7dea53 | |
| parent | 5e4a381cc51ab01e793fb4ca8a29b3daa9bf3ce9 (diff) | |
| download | mariadb-git-aed67d25829791d3e3f8dedc83e17179a1043259.tar.gz | |
In crash handler, output session value of the optimizer switch.
| -rw-r--r-- | sql/mysqld.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 9d87864d939..8a476383d82 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2761,8 +2761,16 @@ the thread stack. Please read http://dev.mysql.com/doc/mysql/en/linux.html\n\n", my_safe_print_str(thd->query(), min(65536,thd->query_length())); fprintf(stderr, "Connection ID (thread ID): %lu\n", (ulong) thd->thread_id); fprintf(stderr, "Status: %s\n", kreason); - fprintf(stderr, "Optimizer switch: %s\n", optimizer_switch_str); - fputc('\n', stderr); + fprintf(stderr, "Optimizer switch: "); + ulonglong optsw= thd->variables.optimizer_switch; + for (uint i= 0; optimizer_switch_names[i+1]; i++, optsw >>= 1) + { + if (i) + fputc(',', stderr); + fprintf(stderr, "%s=%s", + optimizer_switch_names[i], optsw & 1 ? "on" : "off"); + } + fprintf(stderr, "\n\n"); } fprintf(stderr, "\ The manual page at http://dev.mysql.com/doc/mysql/en/crashing.html contains\n\ |