Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
9591b9e9
Commit
9591b9e9
authored
Feb 28, 2007
by
msvensson@pilot.blaudden
Browse files
Options
Browse Files
Download
Plain Diff
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
parents
162f0803
6fac51be
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
2 deletions
+11
-2
.bzrignore
.bzrignore
+1
-0
scripts/Makefile.am
scripts/Makefile.am
+0
-1
sql/mysqld.cc
sql/mysqld.cc
+10
-1
No files found.
.bzrignore
View file @
9591b9e9
...
...
@@ -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
View file @
9591b9e9
...
...
@@ -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
View file @
9591b9e9
...
...
@@ -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
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment