Merge with 5.3

b00ee6e8 · Michael Widenius · bea887e6 · 2149a429 · b00ee6e8
Commit b00ee6e8 authored Apr 03, 2012 by Michael Widenius
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

sql/mysqld.cc sql/mysqld.cc +1 -2

No files found.
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -685,9 +685,8 @@ char *opt_logname, *opt_slow_logname, *opt_bin_logname;

 /* Static variables */

-my_bool opt_stack_trace;
 static volatile sig_atomic_t kill_in_progress;
-
+my_bool opt_stack_trace;
 my_bool opt_expect_abort= 0;
 static my_bool opt_bootstrap, opt_myisam_log;
 static int cleanup_done;