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
b5f67a64
Commit
b5f67a64
authored
Sep 07, 2006
by
tsmith@maint1.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfx
into maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx
parents
2480ec8e
b6cd727e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
sql/mysqld.cc
sql/mysqld.cc
+2
-2
sql/stacktrace.c
sql/stacktrace.c
+0
-1
sql/stacktrace.h
sql/stacktrace.h
+1
-1
No files found.
sql/mysqld.cc
View file @
b5f67a64
...
@@ -7041,10 +7041,10 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
...
@@ -7041,10 +7041,10 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
}
}
switch
(
method
-
1
)
{
switch
(
method
-
1
)
{
case
0
:
case
0
:
method_conv
=
MI_STATS_METHOD_NULLS_EQUAL
;
method_conv
=
MI_STATS_METHOD_NULLS_
NOT_
EQUAL
;
break
;
break
;
case
1
:
case
1
:
method_conv
=
MI_STATS_METHOD_NULLS_
NOT_
EQUAL
;
method_conv
=
MI_STATS_METHOD_NULLS_EQUAL
;
break
;
break
;
case
2
:
case
2
:
method_conv
=
MI_STATS_METHOD_IGNORE_NULLS
;
method_conv
=
MI_STATS_METHOD_IGNORE_NULLS
;
...
...
sql/stacktrace.c
View file @
b5f67a64
...
@@ -44,7 +44,6 @@ void safe_print_str(const char* name, const char* val, int max_len)
...
@@ -44,7 +44,6 @@ void safe_print_str(const char* name, const char* val, int max_len)
}
}
#ifdef TARGET_OS_LINUX
#ifdef TARGET_OS_LINUX
/* Force merge conflict, to avoid bk automerge */
#define SIGRETURN_FRAME_COUNT 2
#define SIGRETURN_FRAME_COUNT 2
#if defined(__alpha__) && defined(__GNUC__)
#if defined(__alpha__) && defined(__GNUC__)
...
...
sql/stacktrace.h
View file @
b5f67a64
...
@@ -19,7 +19,7 @@ extern "C" {
...
@@ -19,7 +19,7 @@ extern "C" {
#endif
#endif
#ifdef TARGET_OS_LINUX
#ifdef TARGET_OS_LINUX
#if defined(HAVE_STACKTRACE) || (defined (__i386__) || (defined(__alpha__) && defined(__GNUC__)))
/* Force conflict to avoid bk automerge */
#if defined(HAVE_STACKTRACE) || (defined (__i386__) || (defined(__alpha__) && defined(__GNUC__)))
#undef HAVE_STACKTRACE
#undef HAVE_STACKTRACE
#define HAVE_STACKTRACE
#define HAVE_STACKTRACE
...
...
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