Skip to content

Commit 88998cf

Browse files
BuggynoursBuggynours
committed
Commit merge resolved files
1 parent a8b7b6c commit 88998cf

File tree

5 files changed

+0
-115
lines changed

5 files changed

+0
-115
lines changed

‎storage/connect/colblk.cpp

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
/************* Colblk C++ Functions Source Code File (.CPP) ************/
22
/* Name: COLBLK.CPP Version 2.1 */
33
/* */
4-
<<<<<<< HEAD
54
/* (C) Copyright to the author Olivier BERTRAND 1998-2015 */
6-
=======
7-
/* (C) Copyright to the author Olivier BERTRAND 1998-2014 */
8-
>>>>>>> MariaDB/10.0
95
/* */
106
/* This file contains the COLBLK class functions. */
117
/***********************************************************************/
@@ -115,11 +111,7 @@ bool COLBLK::Compare(PXOB xp)
115111
/***********************************************************************/
116112
/* SetFormat: function used to set SELECT output format. */
117113
/***********************************************************************/
118-
<<<<<<< HEAD
119114
bool COLBLK::SetFormat(PGLOBAL, FORMAT& fmt)
120-
=======
121-
bool COLBLK::SetFormat(PGLOBAL g, FORMAT& fmt)
122-
>>>>>>> MariaDB/10.0
123115
{
124116
fmt = Format;
125117

@@ -183,11 +175,7 @@ bool COLBLK::InitValue(PGLOBAL g)
183175
/***********************************************************************/
184176
/* SetBuffer: prepare a column block for write operation. */
185177
/***********************************************************************/
186-
<<<<<<< HEAD
187178
bool COLBLK::SetBuffer(PGLOBAL g, PVAL, bool, bool)
188-
=======
189-
bool COLBLK::SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check)
190-
>>>>>>> MariaDB/10.0
191179
{
192180
sprintf(g->Message, MSG(UNDEFINED_AM), "SetBuffer");
193181
return true;
@@ -226,11 +214,7 @@ void COLBLK::WriteColumn(PGLOBAL g)
226214
/***********************************************************************/
227215
/* Make file output of a column descriptor block. */
228216
/***********************************************************************/
229-
<<<<<<< HEAD
230217
void COLBLK::Print(PGLOBAL, FILE *f, uint n)
231-
=======
232-
void COLBLK::Print(PGLOBAL g, FILE *f, uint n)
233-
>>>>>>> MariaDB/10.0
234218
{
235219
char m[64];
236220
int i;
@@ -253,11 +237,7 @@ void COLBLK::Print(PGLOBAL g, FILE *f, uint n)
253237
/***********************************************************************/
254238
/* Make string output of a column descriptor block. */
255239
/***********************************************************************/
256-
<<<<<<< HEAD
257240
void COLBLK::Print(PGLOBAL, char *ps, uint)
258-
=======
259-
void COLBLK::Print(PGLOBAL g, char *ps, uint z)
260-
>>>>>>> MariaDB/10.0
261241
{
262242
sprintf(ps, "R%d.%s", To_Tdb->GetTdb_No(), Name);
263243
} // end of Print
@@ -317,15 +297,9 @@ FIDBLK::FIDBLK(PCOLUMN cp, OPVAL op) : SPCBLK(cp), Op(op)
317297
Buf_Type = TYPE_STRING;
318298
*Format.Type = 'C';
319299
Format.Length = Long;
320-
<<<<<<< HEAD
321300
#if defined(__WIN__)
322301
Format.Prec = 1; // Case insensitive
323302
#endif // __WIN__
324-
=======
325-
#if defined(WIN32)
326-
Format.Prec = 1; // Case insensitive
327-
#endif // WIN32
328-
>>>>>>> MariaDB/10.0
329303
Constant = (!((PTDBASE)To_Tdb)->GetDef()->GetMultiple() &&
330304
To_Tdb->GetAmType() != TYPE_AM_PLG &&
331305
To_Tdb->GetAmType() != TYPE_AM_PLM);
@@ -373,11 +347,7 @@ TIDBLK::TIDBLK(PCOLUMN cp) : SPCBLK(cp)
373347
/***********************************************************************/
374348
/* ReadColumn: what this routine does is to return the table ID. */
375349
/***********************************************************************/
376-
<<<<<<< HEAD
377350
void TIDBLK::ReadColumn(PGLOBAL)
378-
=======
379-
void TIDBLK::ReadColumn(PGLOBAL g)
380-
>>>>>>> MariaDB/10.0
381351
{
382352
if (Tname == NULL) {
383353
Tname = (char*)To_Tdb->GetName();
@@ -436,11 +406,7 @@ SIDBLK::SIDBLK(PCOLUMN cp) : SPCBLK(cp)
436406
/***********************************************************************/
437407
/* ReadColumn: what this routine does is to return the server ID. */
438408
/***********************************************************************/
439-
<<<<<<< HEAD
440409
void SIDBLK::ReadColumn(PGLOBAL)
441-
=======
442-
void SIDBLK::ReadColumn(PGLOBAL g)
443-
>>>>>>> MariaDB/10.0
444410
{
445411
//if (Sname == NULL) {
446412
Sname = (char*)To_Tdb->GetServer();

‎storage/connect/filamdbf.cpp

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -74,28 +74,19 @@ typedef struct _dbfheader {
7474
//uchar Dbfox :4; /* FoxPro if equal to 3 */
7575
uchar Version; /* Version information flags */
7676
char Filedate[3]; /* date, YYMMDD, binary. YY=year-1900 */
77-
<<<<<<< HEAD
7877
private:
79-
=======
80-
private:
81-
>>>>>>> MariaDB/10.0
8278
/* The following four members are stored in little-endian format on disk */
8379
char m_RecordsBuf[4]; /* records in the file */
8480
char m_HeadlenBuf[2]; /* bytes in the header */
8581
char m_ReclenBuf[2]; /* bytes in a record */
8682
char m_FieldsBuf[2]; /* Reserved but used to store fields */
87-
<<<<<<< HEAD
8883
public:
89-
=======
90-
public:
91-
>>>>>>> MariaDB/10.0
9284
char Incompleteflag; /* 01 if incomplete, else 00 */
9385
char Encryptflag; /* 01 if encrypted, else 00 */
9486
char Reserved2[12]; /* for LAN use */
9587
char Mdxflag; /* 01 if production .mdx, else 00 */
9688
char Language; /* Codepage */
9789
char Reserved3[2];
98-
<<<<<<< HEAD
9990

10091
uint Records(void) const {return uint4korr(m_RecordsBuf);}
10192
ushort Headlen(void) const {return uint2korr(m_HeadlenBuf);}
@@ -105,17 +96,6 @@ typedef struct _dbfheader {
10596
void SetHeadlen(ushort num) {int2store(m_HeadlenBuf, num);}
10697
void SetReclen(ushort num) {int2store(m_ReclenBuf, num);}
10798
void SetFields(ushort num) {int2store(m_FieldsBuf, num);}
108-
=======
109-
110-
uint Records() const { return uint4korr(m_RecordsBuf); }
111-
ushort Headlen() const { return uint2korr(m_HeadlenBuf); }
112-
ushort Reclen() const { return uint2korr(m_ReclenBuf); }
113-
ushort Fields() const { return uint2korr(m_FieldsBuf); }
114-
115-
void SetHeadlen(ushort num) { int2store(m_HeadlenBuf, num); }
116-
void SetReclen(ushort num) { int2store(m_ReclenBuf, num); }
117-
void SetFields(ushort num) { int2store(m_FieldsBuf, num); }
118-
>>>>>>> MariaDB/10.0
11999
} DBFHEADER;
120100

121101
/****************************************************************************/
@@ -430,22 +410,13 @@ int DBFBASE::ScanHeader(PGLOBAL g, PSZ fname, int lrecl, char *defpath)
430410
} else if (rc == RC_FX)
431411
return -1;
432412

433-
<<<<<<< HEAD
434413
if ((int)header.Reclen() != lrecl) {
435-
=======
436-
if ((int) header.Reclen() != lrecl) {
437-
>>>>>>> MariaDB/10.0
438414
sprintf(g->Message, MSG(BAD_LRECL), lrecl, header.Reclen());
439415
return -1;
440416
} // endif Lrecl
441417

442-
<<<<<<< HEAD
443418
Records = (int)header.Records();
444419
return (int)header.Headlen();
445-
=======
446-
Records = (int) header.Records();
447-
return (int) header.Headlen();
448-
>>>>>>> MariaDB/10.0
449420
} // end of ScanHeader
450421

451422
/* ---------------------------- Class DBFFAM ------------------------------ */
@@ -606,13 +577,8 @@ bool DBFFAM::AllocateBuffer(PGLOBAL g)
606577
header->Filedate[0] = datm->tm_year - 100;
607578
header->Filedate[1] = datm->tm_mon + 1;
608579
header->Filedate[2] = datm->tm_mday;
609-
<<<<<<< HEAD
610580
header->SetHeadlen((ushort)hlen);
611581
header->SetReclen((ushort)reclen);
612-
=======
613-
header->SetHeadlen((ushort) hlen);
614-
header->SetReclen((ushort) reclen);
615-
>>>>>>> MariaDB/10.0
616582
descp = (DESCRIPTOR*)header;
617583

618584
// Currently only standard Xbase types are supported
@@ -673,22 +639,13 @@ bool DBFFAM::AllocateBuffer(PGLOBAL g)
673639
DBFHEADER header;
674640

675641
if ((rc = dbfhead(g, Stream, Tdbp->GetFile(g), &header)) == RC_OK) {
676-
<<<<<<< HEAD
677642
if (Lrecl != (int)header.Reclen()) {
678-
=======
679-
if (Lrecl != (int) header.Reclen()) {
680-
>>>>>>> MariaDB/10.0
681643
sprintf(g->Message, MSG(BAD_LRECL), Lrecl, header.Reclen());
682644
return true;
683645
} // endif Lrecl
684646

685-
<<<<<<< HEAD
686647
Records = (int)header.Records();
687648
Headlen = (int)header.Headlen();
688-
=======
689-
Records = (int) header.Records();
690-
Headlen = (int) header.Headlen();
691-
>>>>>>> MariaDB/10.0
692649
} else if (rc == RC_NF) {
693650
Records = 0;
694651
Headlen = 0;
@@ -924,16 +881,10 @@ void DBFFAM::CloseTableFile(PGLOBAL g, bool abort)
924881
if ((Stream= global_fopen(g, MSGID_OPEN_MODE_STRERROR, filename, "r+b")))
925882
{
926883
char nRecords[4];
927-
<<<<<<< HEAD
928884
int4store(nRecords, n);
929885

930886
fseek(Stream, 4, SEEK_SET); // Get header.Records position
931887
fwrite(nRecords, sizeof(nRecords), 1, Stream);
932-
=======
933-
int4store(&nRecords, n);
934-
fseek(Stream, 4, SEEK_SET); // Get header.Records position
935-
fwrite(&nRecords, sizeof(nRecords), 1, Stream);
936-
>>>>>>> MariaDB/10.0
937888
fclose(Stream);
938889
Stream= NULL;
939890
Records= n; // Update Records value
@@ -1008,22 +959,13 @@ bool DBMFAM::AllocateBuffer(PGLOBAL g)
1008959
/************************************************************************/
1009960
DBFHEADER *hp = (DBFHEADER*)Memory;
1010961

1011-
<<<<<<< HEAD
1012962
if (Lrecl != (int)hp->Reclen()) {
1013-
=======
1014-
if (Lrecl != (int) hp->Reclen()) {
1015-
>>>>>>> MariaDB/10.0
1016963
sprintf(g->Message, MSG(BAD_LRECL), Lrecl, hp->Reclen());
1017964
return true;
1018965
} // endif Lrecl
1019966

1020-
<<<<<<< HEAD
1021967
Records = (int)hp->Records();
1022968
Headlen = (int)hp->Headlen();
1023-
=======
1024-
Records = (int) hp->Records();
1025-
Headlen = (int) hp->Headlen();
1026-
>>>>>>> MariaDB/10.0
1027969
} // endif Headlen
1028970

1029971
/**************************************************************************/

‎storage/connect/jsonudf.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -410,11 +410,7 @@ void Json_Array_Add_deinit(UDF_INIT* initid)
410410
} // end of Json_Array_Add_deinit
411411

412412
/***********************************************************************/
413-
<<<<<<< HEAD
414413
/* Delete a value from a Json array. */
415-
=======
416-
/* Add values to a Json array. */
417-
>>>>>>> MariaDB/10.0
418414
/***********************************************************************/
419415
my_bool Json_Array_Delete_init(UDF_INIT *initid, UDF_ARGS *args, char *message)
420416
{
@@ -433,11 +429,7 @@ my_bool Json_Array_Delete_init(UDF_INIT *initid, UDF_ARGS *args, char *message)
433429
} // end of Json_Array_Delete_init
434430

435431
char *Json_Array_Delete(UDF_INIT *initid, UDF_ARGS *args, char *result,
436-
<<<<<<< HEAD
437432
unsigned long *res_length, char *, char *)
438-
=======
439-
unsigned long *res_length, char *is_null, char *error)
440-
>>>>>>> MariaDB/10.0
441433
{
442434
char *str;
443435
int n;
@@ -459,11 +451,7 @@ char *Json_Array_Delete(UDF_INIT *initid, UDF_ARGS *args, char *result,
459451
} else {
460452
n = *(int*)args->args[1];
461453
arp = jvp->GetArray();
462-
<<<<<<< HEAD
463454
arp->DeleteValue(n);
464-
=======
465-
arp->DeleteValue(n - 1);
466-
>>>>>>> MariaDB/10.0
467455
arp->InitArray(g);
468456

469457
if (!(str = Serialize(g, arp, NULL, 0))) {

‎storage/connect/rcmsg.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,9 @@
2121
#include "msgid.h"
2222
#endif // NEWMSG
2323

24-
<<<<<<< HEAD
2524
#if !defined(__WIN__)
2625
#define stricmp strcasecmp
2726
#endif // !__WIN__
28-
=======
29-
#if !defined(WIN32)
30-
#define stricmp strcasecmp
31-
#endif // !WIN32
32-
>>>>>>> MariaDB/10.0
3327

3428
char *msglang(void);
3529

‎storage/connect/tabxml.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1482,11 +1482,6 @@ bool XMLCOL::ParseXpath(PGLOBAL g, bool mode)
14821482
// HTML like table, columns are retrieved by position
14831483
new(this) XPOSCOL(Value); // Change the class of this column
14841484
Inod = -1;
1485-
<<<<<<< HEAD
1486-
=======
1487-
// Tdbp->Hasnod = true;
1488-
// return false;
1489-
>>>>>>> MariaDB/10.0
14901485
} else if (Type == 0 && !mode) {
14911486
strcat(strcat(pbuf, "@"), Name);
14921487
} else { // Type == 1

0 commit comments

Comments
 (0)