mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 10:14:19 +01:00
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
This commit is contained in:
commit
9591b9e922
3 changed files with 11 additions and 2 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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\
|
||||
|
|
Loading…
Add table
Reference in a new issue