Commit 3b3f6cac authored by Olivier Bertrand's avatar Olivier Bertrand

Typo to check buildbot

parent 5fa2a6ce
...@@ -245,6 +245,11 @@ storage/mroonga/vendor/groonga/src/suggest/groonga-suggest-create-dataset ...@@ -245,6 +245,11 @@ storage/mroonga/vendor/groonga/src/suggest/groonga-suggest-create-dataset
*.ko *.ko
*.obj *.obj
*.elf *.elf
*.exp
*.manifest
*.dep
*.idb
*.res
# Precompiled Headers # Precompiled Headers
*.gch *.gch
......
...@@ -313,10 +313,6 @@ PQRYRES XMLColumns(PGLOBAL g, char *dp, char *tab, PTOS topt, bool info) ...@@ -313,10 +313,6 @@ PQRYRES XMLColumns(PGLOBAL g, char *dp, char *tab, PTOS topt, bool info)
pxcp = xcp; pxcp = xcp;
// for (j = lvl - 1; j >= 0; j--)
// if (jrp[j] && (jrp[j] = jrp[j]->GetNext()))
// goto more;
if (vp->atp) if (vp->atp)
vp->atp = vp->atp->GetNext(g); vp->atp = vp->atp->GetNext(g);
...@@ -421,8 +417,6 @@ XMLDEF::XMLDEF(void) ...@@ -421,8 +417,6 @@ XMLDEF::XMLDEF(void)
bool XMLDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff) bool XMLDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff)
{ {
char *defrow, *defcol, buf[10]; char *defrow, *defcol, buf[10];
//void *memp = Cat->GetDescp();
//PSZ dbfile = Cat->GetDescFile();
Fn = GetStringCatInfo(g, "Filename", NULL); Fn = GetStringCatInfo(g, "Filename", NULL);
Encoding = GetStringCatInfo(g, "Encoding", "UTF-8"); Encoding = GetStringCatInfo(g, "Encoding", "UTF-8");
...@@ -479,12 +473,6 @@ bool XMLDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff) ...@@ -479,12 +473,6 @@ bool XMLDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff)
Header = GetIntCatInfo("Header", 0); Header = GetIntCatInfo("Header", 0);
GetCharCatInfo("Xmlsup", "*", buf, sizeof(buf)); GetCharCatInfo("Xmlsup", "*", buf, sizeof(buf));
//if (*buf == '*') // Try the old (deprecated) option
// GetCharCatInfo("Method", "*", buf, sizeof(buf));
//if (*buf == '*') // Is there a default for the database?
// GetCharCatInfo("Defxml", XMLSUP, buf, sizeof(buf));
// Note that if no support is specified, the default is MS-DOM // Note that if no support is specified, the default is MS-DOM
// on Windows and libxml2 otherwise // on Windows and libxml2 otherwise
if (*buf == '*') if (*buf == '*')
...@@ -499,7 +487,6 @@ bool XMLDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff) ...@@ -499,7 +487,6 @@ bool XMLDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff)
// Get eventual table node attribute // Get eventual table node attribute
Attrib = GetStringCatInfo(g, "Attribute", ""); Attrib = GetStringCatInfo(g, "Attribute", "");
Hdattr = GetStringCatInfo(g, "HeadAttr", ""); Hdattr = GetStringCatInfo(g, "HeadAttr", "");
return false; return false;
} // end of DefineAM } // end of DefineAM
...@@ -519,30 +506,6 @@ PTDB XMLDEF::GetTable(PGLOBAL g, MODE m) ...@@ -519,30 +506,6 @@ PTDB XMLDEF::GetTable(PGLOBAL g, MODE m)
return tdbp; return tdbp;
} // end of GetTable } // end of GetTable
#if 0
/***********************************************************************/
/* DeleteTableFile: Delete XML table files using platform API. */
/***********************************************************************/
bool XMLDEF::DeleteTableFile(PGLOBAL g)
{
char filename[_MAX_PATH];
bool rc;
// Delete the XML table file if not protected
if (!IsReadOnly()) {
PlugSetPath(filename, Fn, GetPath());
#if defined(WIN32)
rc = !DeleteFile(filename);
#else // UNIX
rc = remove(filename);
#endif // UNIX
} else
rc =true;
return rc; // Return true if error
} // end of DeleteTableFile
#endif // 0
/* ------------------------- TDBXML Class ---------------------------- */ /* ------------------------- TDBXML Class ---------------------------- */
/***********************************************************************/ /***********************************************************************/
...@@ -854,7 +817,6 @@ bool TDBXML::Initialize(PGLOBAL g) ...@@ -854,7 +817,6 @@ bool TDBXML::Initialize(PGLOBAL g)
To_Xb = Docp->LinkXblock(g, Mode, rc, filename); To_Xb = Docp->LinkXblock(g, Mode, rc, filename);
// Add a CONNECT comment node // Add a CONNECT comment node
// sprintf(buf, " Created by CONNECT %s ", version);
strcpy(buf, " Created by the MariaDB CONNECT Storage Engine"); strcpy(buf, " Created by the MariaDB CONNECT Storage Engine");
Docp->AddComment(g, buf); Docp->AddComment(g, buf);
...@@ -1279,7 +1241,6 @@ void TDBXML::CloseDB(PGLOBAL g) ...@@ -1279,7 +1241,6 @@ void TDBXML::CloseDB(PGLOBAL g)
if (Docp) { if (Docp) {
if (Changed) { if (Changed) {
char filename[_MAX_PATH]; char filename[_MAX_PATH];
// PDBUSER dup = (PDBUSER)g->Activityp->Aptr;
// We used the file name relative to recorded datapath // We used the file name relative to recorded datapath
PlugSetPath(filename, Xfile, GetPath()); PlugSetPath(filename, Xfile, GetPath());
...@@ -1321,7 +1282,6 @@ void TDBXML::CloseDB(PGLOBAL g) ...@@ -1321,7 +1282,6 @@ void TDBXML::CloseDB(PGLOBAL g)
NewRow = false; NewRow = false;
Hasnod = false; Hasnod = false;
Write = false; Write = false;
// Bufdone = false;
Nodedone = false; Nodedone = false;
Void = false; Void = false;
Nrow = -1; Nrow = -1;
...@@ -1413,8 +1373,6 @@ bool XMLCOL::AllocBuf(PGLOBAL g, bool mode) ...@@ -1413,8 +1373,6 @@ bool XMLCOL::AllocBuf(PGLOBAL g, bool mode)
if (Valbuf) if (Valbuf)
return false; // Already done return false; // Already done
//Valbuf = (char*)PlugSubAlloc(g, NULL, Long + 1);
//Valbuf[Long] = '\0';
return ParseXpath(g, mode); return ParseXpath(g, mode);
} // end of AllocBuf } // end of AllocBuf
...@@ -1506,8 +1464,6 @@ bool XMLCOL::ParseXpath(PGLOBAL g, bool mode) ...@@ -1506,8 +1464,6 @@ bool XMLCOL::ParseXpath(PGLOBAL g, bool mode)
// HTML like table, columns are retrieved by position // HTML like table, columns are retrieved by position
new(this) XPOSCOL(Value); // Change the class of this column new(this) XPOSCOL(Value); // Change the class of this column
Inod = -1; Inod = -1;
// Tdbp->Hasnod = true;
// return false;
} else if (Type == 0 && !mode) { } else if (Type == 0 && !mode) {
strcat(strcat(pbuf, "@"), Name); strcat(strcat(pbuf, "@"), Name);
} else { // Type == 1 } else { // Type == 1
...@@ -1657,7 +1613,6 @@ void XMLCOL::WriteColumn(PGLOBAL g) ...@@ -1657,7 +1613,6 @@ void XMLCOL::WriteColumn(PGLOBAL g)
int done = 0; int done = 0;
int i, n, k = 0; int i, n, k = 0;
PXNODE TopNode = NULL; PXNODE TopNode = NULL;
//PXATTR AttNode = NULL;
if (trace > 1) if (trace > 1)
htrc("XML WriteColumn: col %s R%d coluse=%.4X status=%.4X\n", htrc("XML WriteColumn: col %s R%d coluse=%.4X status=%.4X\n",
...@@ -1892,7 +1847,6 @@ void XMULCOL::WriteColumn(PGLOBAL g) ...@@ -1892,7 +1847,6 @@ void XMULCOL::WriteColumn(PGLOBAL g)
int done = 0; int done = 0;
int i, n, len, k = 0; int i, n, len, k = 0;
PXNODE TopNode = NULL; PXNODE TopNode = NULL;
//PXATTR AttNode = NULL;
if (trace) if (trace)
htrc("XML WriteColumn: col %s R%d coluse=%.4X status=%.4X\n", htrc("XML WriteColumn: col %s R%d coluse=%.4X status=%.4X\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment