diff options
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | scripts/Makefile.am | 1 | ||||
| -rw-r--r-- | sql/mysqld.cc | 11 |
3 files changed, 11 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore index 6bb1ebef69b..4ee902bbeb7 100644 --- a/.bzrignore +++ b/.bzrignore @@ -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 diff --git a/scripts/Makefile.am b/scripts/Makefile.am index dc0c1396a44..934202b5c60 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -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 diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 6ffead4e3d3..1b2fff9da2d 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -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\ |