Commit 3297d47f authored by unknown's avatar unknown
Browse files

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
  Auto merged
BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents bd296f16 2a02f9c9

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1249,6 +1249,7 @@ mysql-test/*.ds? 
mysql-test/*.vcproj

mysql-test/gmon.out

mysql-test/install_test_db

mysql-test/lib/init_db.sql

mysql-test/mtr

mysql-test/mysql-test-run

mysql-test/mysql-test-run-shell

scripts/Makefile.am

+0 −1
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ CLEANFILES = @server_scripts@ \ 
			mysqldumpslow \

			mysql_tableinfo \

			mysqld_multi \

			mysql_create_system_tables \

			mysql_fix_privilege_tables.sql



# mysqlbug should be distributed built so that people can report build

sql/mysqld.cc

+10 −1
Original line number Diff line number Diff line
@@ -2097,7 +2097,10 @@ static void check_data_home(const char *path) 


extern "C" sig_handler handle_segfault(int sig)

{

  time_t curr_time;

  struct tm tm;

  THD *thd=current_thd;



  /*

    Strictly speaking, one needs a mutex here

    but since we have got SIGSEGV already, things are a mess
@@ -2111,11 +2114,17 @@ extern "C" sig_handler handle_segfault(int sig) 
  }



  segfaulted = 1;



  curr_time= time(NULL);

  localtime_r(&curr_time, &tm);



  fprintf(stderr,"\

mysqld got signal %d;\n\

%02d%02d%02d %2d:%02d:%02d - mysqld got signal %d;\n\

This could be because you hit a bug. It is also possible that this binary\n\

or one of the libraries it was linked against is corrupt, improperly built,\n\

or misconfigured. This error can also be caused by malfunctioning hardware.\n",

          tm.tm_year % 100, tm.tm_mon+1, tm.tm_mday,

          tm.tm_hour, tm.tm_min, tm.tm_sec,

	  sig);

  fprintf(stderr, "\

We will try our best to scrape up some info that will hopefully help diagnose\n\