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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
a9ecb79e
Commit
a9ecb79e
authored
Feb 07, 2008
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria
into mysqlwin32.:C:/mysql-maria
parents
033cba83
0954594b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
15 deletions
+13
-15
.tree-is-private
.tree-is-private
+0
-0
include/my_dbug.h
include/my_dbug.h
+13
-0
mysys/my_thr_init.c
mysys/my_thr_init.c
+0
-15
No files found.
.tree-is-private
deleted
100644 → 0
View file @
033cba83
include/my_dbug.h
View file @
a9ecb79e
...
@@ -87,7 +87,20 @@ extern void _db_flush_();
...
@@ -87,7 +87,20 @@ extern void _db_flush_();
#define DEBUGGER_OFF do { _dbug_on_= 0; } while(0)
#define DEBUGGER_OFF do { _dbug_on_= 0; } while(0)
#define DEBUGGER_ON do { _dbug_on_= 1; } while(0)
#define DEBUGGER_ON do { _dbug_on_= 1; } while(0)
#define IF_DBUG(A) A
#define IF_DBUG(A) A
#ifndef __WIN__
#define DBUG_ABORT() (_db_flush_(), abort())
#define DBUG_ABORT() (_db_flush_(), abort())
#else
/*
Avoid popup with abort/retry/ignore buttons. When BUG#31745 is fixed we can
call abort() instead of _exit(3) (now it would cause a "test signal" popup).
*/
#include <crtdbg.h>
#define DBUG_ABORT() (_db_flush_(),\
(void)_CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE),\
(void)_CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR),\
_exit(3))
#endif
#else
/* No debugger */
#else
/* No debugger */
#define DBUG_ENTER(a1)
#define DBUG_ENTER(a1)
...
...
mysys/my_thr_init.c
View file @
a9ecb79e
...
@@ -444,18 +444,3 @@ static uint get_thread_lib(void)
...
@@ -444,18 +444,3 @@ static uint get_thread_lib(void)
}
}
#endif
/* THREAD */
#endif
/* THREAD */
#ifdef __WIN__
/*
With Windows debug builds abort() causes a popup from CRT; as abort()
is used in tests it is annoying so we use a custom one.
*/
void
abort
(
void
)
{
#ifdef REENABLE_AFTER_FIX_FOR_BUG_31745
/* don't want a popup */
raise
(
SIGABRT
);
#endif
_exit
(
3
);
}
#endif
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