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

Xcode compatibility update

Browse Source
This commit is contained in:
Sergei Krivonos 2021-10-06 11:31:08 +03:00 committed by SergMariaDB
parent 8f04ec2885
commit 6f32b28be5
7 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -338,6 +338,7 @@ x86/
build/
bld/
[Bb]in/
/cmake-build-debug/
[Oo]bj/
# Roslyn cache directories
@ -518,4 +519,5 @@ compile_commands.json
# Visual Studio Code workspace
.vscode/
/.idea/
.cache/clangd

3
include/my_context.h
View File

@ -52,6 +52,9 @@ struct my_context {
#ifdef MY_CONTEXT_USE_UCONTEXT
#if defined(__APPLE__) && !defined(_XOPEN_SOURCE)
#define _XOPEN_SOURCE
#endif
#include <ucontext.h>
struct my_context {

7
mysys/my_context.c
View File

@ -29,6 +29,10 @@
#endif
#ifdef MY_CONTEXT_USE_UCONTEXT
#ifdef __APPLE__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/*
The makecontext() only allows to pass integers into the created context :-(
We want to pass pointers, so we do it this kinda hackish way.
@ -154,6 +158,9 @@ my_context_destroy(struct my_context *c)
DBUG_FREE_CODE_STATE(&c->dbug_state);
}
#ifdef __APPLE__
#pragma GCC diagnostic pop
#endif
#endif /* MY_CONTEXT_USE_UCONTEXT */

9
storage/connect/bsonudf.cpp
View File

@ -12,6 +12,7 @@
#include <mysql.h>
#include <sql_error.h>
#include <stdio.h>
#include <cassert>
#include "bsonudf.h"
@ -621,7 +622,7 @@ PVAL BJNX::GetCalcValue(PGLOBAL g, PBVAL bap, int n)
{
// For calculated arrays, a local Value must be used
int lng = 0;
short type, prec = 0;
short type = 0, prec = 0;
bool b = n < Nod - 1;
PVAL valp;
PBVAL vlp, vp;
@ -690,7 +691,7 @@ PVAL BJNX::GetCalcValue(PGLOBAL g, PBVAL bap, int n)
break;
default:
break;
DBUG_ASSERT(!"Implement new op type support.");
} // endswitch Op
return valp = AllocateValue(g, type, lng, prec);
@ -4978,7 +4979,7 @@ char *bbin_array_add(UDF_INIT *initid, UDF_ARGS *args, char *result,
uint n = 2;
int* x = GetIntArgPtr(g, args, n);
BJNX bnx(g, NULL, TYPE_STRING);
PBVAL jarp, top, jvp = NULL;
PBVAL jarp = NULL, top = NULL, jvp = NULL;
PBVAL jsp = bnx.MakeValue(args, 0, true, &top);
if (bnx.CheckPath(g, args, jsp, jvp, 2))
@ -5611,7 +5612,7 @@ char *bbin_object_values(UDF_INIT *initid, UDF_ARGS *args, char *result,
if (!bsp) {
if (!CheckMemory(g, initid, args, 1, true, true)) {
BJNX bnx(g);
PBVAL top, jarp;
PBVAL top, jarp = NULL;
PBVAL jvp = bnx.MakeValue(args, 0, true, &top);
if (jvp->Type == TYPE_JOB) {

10
storage/connect/inihandl.cpp
View File

@ -193,17 +193,17 @@ static void PROFILE_Save( FILE *file, PROFILESECTION *section )
secno++;
}
for (key = section->key; key; key = key->next)
if (key->name && key->name[0]) {
for (key= section->key; key; key= key->next) {
if (key->name[0]) {
fprintf(file, "%s", SVP(key->name));
if (key->value)
fprintf(file, "=%s", SVP(key->value));
fprintf(file, "\n");
} // endif key->name
} // endfor section
} // endif key->name
}
} // endfor section
} // end of PROFILE_Save

2
storage/connect/tabbson.cpp
View File

@ -871,7 +871,7 @@ PBVAL BCUTIL::MakeBson(PGLOBAL g, PBVAL jsp, int n)
/***********************************************************************/
PBVAL BCUTIL::GetRowValue(PGLOBAL g, PBVAL row, int i)
{
int nod = Cp->Nod, n = nod - 1;
int nod = Cp->Nod;
JNODE *nodes = Cp->Nodes;
PBVAL arp;
PBVAL bvp = NULL;

12
storage/innobase/row/row0upd.cc
View File

@ -2470,13 +2470,13 @@ row_upd_sec_index_entry(
case DB_LOCK_WAIT_TIMEOUT:
WSREP_DEBUG("Foreign key check fail: "
"%s on table %s index %s query %s",
ut_strerr(err), index->name, index->table->name,
ut_strerr(err), index->name(), index->table->name.m_name,
wsrep_thd_query(trx->mysql_thd));
break;
default:
WSREP_ERROR("Foreign key check fail: "
"%s on table %s index %s query %s",
ut_strerr(err), index->name, index->table->name,
ut_strerr(err), index->name(), index->table->name.m_name,
wsrep_thd_query(trx->mysql_thd));
break;
}
@ -2806,14 +2806,14 @@ check_fk:
case DB_LOCK_WAIT_TIMEOUT:
WSREP_DEBUG("Foreign key check fail: "
"%s on table %s index %s query %s",
ut_strerr(err), index->name, index->table->name,
ut_strerr(err), index->name(), index->table->name.m_name,
wsrep_thd_query(trx->mysql_thd));
goto err_exit;
default:
WSREP_ERROR("Foreign key check fail: "
"%s on table %s index %s query %s",
ut_strerr(err), index->name, index->table->name,
ut_strerr(err), index->name(), index->table->name.m_name,
wsrep_thd_query(trx->mysql_thd));
goto err_exit;
@ -3037,13 +3037,13 @@ row_upd_del_mark_clust_rec(
case DB_LOCK_WAIT_TIMEOUT:
WSREP_DEBUG("Foreign key check fail: "
"%d on table %s index %s query %s",
err, index->name, index->table->name,
err, index->name(), index->table->name.m_name,
wsrep_thd_query(trx->mysql_thd));
break;
default:
WSREP_ERROR("Foreign key check fail: "
"%d on table %s index %s query %s",
err, index->name, index->table->name,
err, index->name(), index->table->name.m_name,
wsrep_thd_query(trx->mysql_thd));
break;
}