diff options
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 055dceaf4d3..b788c8d122c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1082,9 +1082,10 @@ inline static __volatile__ void trace_stack() uchar **stack_bottom; uchar** ebp; LINT_INIT(ebp); - fprintf(stderr, "Attemping backtrace, please send the info below to \ -bugs@lists.mysql.com. If you see no messages after this, something \ -went terribly wrong - report this anyway\n"); + fprintf(stderr, +"Attemping backtrace. You can use the following information to find out\n\ +where mysqld died. If you see no messages after this, something went\n\ +terribly wrong\n"); THD* thd = current_thd; uint frame_count = 0; __asm __volatile__ ("movl %%ebp,%0" @@ -1092,7 +1093,7 @@ went terribly wrong - report this anyway\n"); :"r"(ebp)); if (!ebp) { - fprintf(stderr, "frame pointer (ebp) is NULL, did you compile with \ + fprintf(stderr, "frame pointer (ebp) is NULL, did you compile with\n\ -fomit-frame-pointer? Aborting backtrace\n"); return; } @@ -1143,9 +1144,9 @@ static sig_handler handle_segfault(int sig) segfaulted = 1; fprintf(stderr,"\ mysqld got signal %d;\n\ -The manual section 'Debugging a MySQL server' tells you how to use a \n\ -debugger on the core file to produce a backtrace that may help you find out\n\ -why mysqld died\n",sig); +The manual section 'Debugging a MySQL server' tells you how to use a\n\ +stack trace and/or the core file to produce a readable backtrace that may\n\ +help in finding out why mysqld died\n",sig); #if defined(HAVE_LINUXTHREADS) #ifdef __i386__ trace_stack(); @@ -1622,12 +1623,14 @@ int main(int argc, char **argv) { server_id= !master_host ? 1 : 2; switch (server_id) { +#ifdef EXTRA_DEBUG case 1: sql_print_error("\ Warning: one should set server_id to a non-0 value if log-bin is enabled.\n\ Will log updates to binary log, but will not accept connections from slaves"); break; - default: +#endif + case 2: sql_print_error("\ Warning: one should set server_id to a non-0 value if master_host is set.\n\ The server will not act as a slave"); @@ -2548,7 +2551,7 @@ CHANGEABLE_VAR changeable_vars[] = { { "lower_case_table_names", (long*) &lower_case_table_names, IF_WIN(1,0), 0, 1, 0, 1 }, { "max_allowed_packet", (long*) &max_allowed_packet, - 1024*1024L, 80, 17*1024*1024L, MALLOC_OVERHEAD, 1024 }, + 1024*1024L, 80, 64*1024*1024L, MALLOC_OVERHEAD, 1024 }, { "max_binlog_cache_size", (long*) &max_binlog_cache_size, ~0L, IO_SIZE, ~0L, 0, IO_SIZE }, { "max_connections", (long*) &max_connections, |