1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfx

Browse Source 
into  maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx
This commit is contained in:
tsmith@maint1.mysql.com 2006-09-07 00:59:08 +02:00
commit b5f67a642f
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/mysqld.cc
View File

@ -7041,10 +7041,10 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
}
switch (method-1) {
case 0:
method_conv= MI_STATS_METHOD_NULLS_EQUAL;
method_conv= MI_STATS_METHOD_NULLS_NOT_EQUAL;
break;
case 1:
method_conv= MI_STATS_METHOD_NULLS_NOT_EQUAL;
method_conv= MI_STATS_METHOD_NULLS_EQUAL;
break;
case 2:
method_conv= MI_STATS_METHOD_IGNORE_NULLS;

1
sql/stacktrace.c
View File

@ -44,7 +44,6 @@ void safe_print_str(const char* name, const char* val, int max_len)
}
#ifdef TARGET_OS_LINUX
/* Force merge conflict, to avoid bk automerge */
#define SIGRETURN_FRAME_COUNT 2
#if defined(__alpha__) && defined(__GNUC__)

2
sql/stacktrace.h
View File

@ -19,7 +19,7 @@ extern "C" {
#endif
#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
#define HAVE_STACKTRACE