mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
- Use delayed load for the MongoDB C Drive on Windows
modified: storage/connect/CMakeLists.txt modified: storage/connect/cmgoconn.cpp modified: storage/connect/ha_connect.cc - Add FORCE to the connect_type_conv enum values This will translate binary values to TYPE_STRING modified: storage/connect/checklvl.h modified: storage/connect/ha_connect.cc modified: storage/connect/odbconn.cpp - Change the connect_xtrace variable to from int to set modified: storage/connect/array.cpp modified: storage/connect/blkfil.cpp modified: storage/connect/block.h modified: storage/connect/cmgoconn.cpp modified: storage/connect/colblk.cpp modified: storage/connect/connect.cc modified: storage/connect/filamap.cpp modified: storage/connect/filamdbf.cpp modified: storage/connect/filamfix.cpp modified: storage/connect/filamgz.cpp modified: storage/connect/filamtxt.cpp modified: storage/connect/filamvct.cpp modified: storage/connect/filamzip.cpp modified: storage/connect/filter.cpp modified: storage/connect/global.h modified: storage/connect/ha_connect.cc modified: storage/connect/javaconn.cpp modified: storage/connect/jdbconn.cpp modified: storage/connect/jmgfam.cpp modified: storage/connect/jmgoconn.cpp modified: storage/connect/json.cpp modified: storage/connect/jsonudf.cpp modified: storage/connect/mongo.cpp modified: storage/connect/mycat.cc modified: storage/connect/myconn.cpp modified: storage/connect/odbconn.cpp modified: storage/connect/plgdbutl.cpp modified: storage/connect/plugutil.cpp modified: storage/connect/reldef.cpp modified: storage/connect/tabcol.cpp modified: storage/connect/tabdos.cpp modified: storage/connect/tabext.cpp modified: storage/connect/tabfix.cpp modified: storage/connect/tabfmt.cpp modified: storage/connect/tabjdbc.cpp modified: storage/connect/tabjson.cpp modified: storage/connect/table.cpp modified: storage/connect/tabmul.cpp modified: storage/connect/tabmysql.cpp modified: storage/connect/tabodbc.cpp modified: storage/connect/tabpivot.cpp modified: storage/connect/tabsys.cpp modified: storage/connect/tabtbl.cpp modified: storage/connect/tabutil.cpp modified: storage/connect/tabvct.cpp modified: storage/connect/tabwmi.cpp modified: storage/connect/tabxml.cpp modified: storage/connect/user_connect.cc modified: storage/connect/valblk.cpp modified: storage/connect/value.cpp modified: storage/connect/xindex.cpp - Restore connect_enable_mongo variable (but undocumented) modified: storage/connect/ha_connect.cc modified: storage/connect/mycat.cc modified: storage/connect/mysql-test/connect/r/json_java_2.result modified: storage/connect/mysql-test/connect/r/json_java_3.result modified: storage/connect/mysql-test/connect/r/json_mongo_c.result modified: storage/connect/mysql-test/connect/r/mongo_c.result modified: storage/connect/mysql-test/connect/r/mongo_java_2.result modified: storage/connect/mysql-test/connect/r/mongo_java_3.result modified: storage/connect/mysql-test/connect/r/tbl_thread.result modified: storage/connect/mysql-test/connect/t/mongo.inc modified: storage/connect/mysql-test/connect/t/mongo_test.inc modified: storage/connect/mysql-test/connect/t/tbl_thread.test
This commit is contained in:
Olivier Bertrand
@@ -704,7 +704,7 @@ int TDBDOS::MakeBlockValues(PGLOBAL g)
|
||||
// savmin = cdp->GetBmap();
|
||||
// cdp->SetBmap(PlugSubAlloc(g, NULL, block * sizeof(int)));
|
||||
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("Dval(%p) Bmap(%p) col(%d) %s Block=%d lg=%d\n",
|
||||
cdp->GetDval(), cdp->GetBmap(), i, cdp->GetName(), block, lg);
|
||||
|
||||
@@ -729,7 +729,7 @@ int TDBDOS::MakeBlockValues(PGLOBAL g)
|
||||
memset(cdp->GetMax(), 0, block * lg);
|
||||
} // endif Type
|
||||
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("min(%p) max(%p) col(%d) %s Block=%d lg=%d\n",
|
||||
cdp->GetMin(), cdp->GetMax(), i, cdp->GetName(), block, lg);
|
||||
|
||||
@@ -901,7 +901,7 @@ bool TDBDOS::SaveBlockValues(PGLOBAL g)
|
||||
"wb", (int)errno, filename);
|
||||
strcat(strcat(g->Message, ": "), strerror(errno));
|
||||
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("%s\n", g->Message);
|
||||
|
||||
return true;
|
||||
@@ -1634,7 +1634,7 @@ int TDBDOS::TestBlock(PGLOBAL g)
|
||||
To_Filter = NULL; // So remove filter
|
||||
} // endswitch Beval
|
||||
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("BF Eval Beval=%d\n", Beval);
|
||||
|
||||
} // endif To_BlkFil
|
||||
@@ -1779,7 +1779,7 @@ int TDBDOS::MakeIndex(PGLOBAL g, PIXDEF pxdf, bool add)
|
||||
return RC_INFO; // Error or Physical table does not exist
|
||||
|
||||
} catch (int n) {
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("Exception %d: %s\n", n, g->Message);
|
||||
rc = RC_FX;
|
||||
} catch (const char *msg) {
|
||||
@@ -1902,7 +1902,7 @@ bool TDBDOS::InitialyzeIndex(PGLOBAL g, volatile PIXDEF xdp, bool sorted)
|
||||
} // endif brc
|
||||
|
||||
} catch (int n) {
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("Exception %d: %s\n", n, g->Message);
|
||||
brc = true;
|
||||
} catch (const char *msg) {
|
||||
@@ -2001,7 +2001,7 @@ int TDBDOS::Cardinality(PGLOBAL g)
|
||||
if (len >= 0) {
|
||||
int rec;
|
||||
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("Estimating lines len=%d ending=%d/n",
|
||||
len, ((PDOSDEF)To_Def)->Ending);
|
||||
|
||||
@@ -2018,7 +2018,7 @@ int TDBDOS::Cardinality(PGLOBAL g)
|
||||
|
||||
Cardinal = (len + rec - 1) / rec;
|
||||
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("avglen=%d MaxSize%d\n", rec, Cardinal);
|
||||
|
||||
} // endif len
|
||||
@@ -2048,7 +2048,7 @@ int TDBDOS::GetMaxSize(PGLOBAL g)
|
||||
if (len >= 0) {
|
||||
int rec;
|
||||
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("Estimating lines len=%d ending=%d/n",
|
||||
len, ((PDOSDEF)To_Def)->Ending);
|
||||
|
||||
@@ -2059,7 +2059,7 @@ int TDBDOS::GetMaxSize(PGLOBAL g)
|
||||
rec = EstimatedLength() + ((PDOSDEF)To_Def)->Ending;
|
||||
MaxSize = (len + rec - 1) / rec;
|
||||
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("avglen=%d MaxSize%d\n", rec, MaxSize);
|
||||
|
||||
} // endif len
|
||||
@@ -2108,7 +2108,7 @@ bool TDBDOS::IsUsingTemp(PGLOBAL)
|
||||
/***********************************************************************/
|
||||
bool TDBDOS::OpenDB(PGLOBAL g)
|
||||
{
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("DOS OpenDB: tdbp=%p tdb=R%d use=%d mode=%d\n",
|
||||
this, Tdb_No, Use, Mode);
|
||||
|
||||
@@ -2184,7 +2184,7 @@ bool TDBDOS::OpenDB(PGLOBAL g)
|
||||
} else
|
||||
memset(To_Line, 0, linelen);
|
||||
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("OpenDos: R%hd mode=%d To_Line=%p\n", Tdb_No, Mode, To_Line);
|
||||
|
||||
if (SkipHeader(g)) // When called from CSV/FMT files
|
||||
@@ -2202,7 +2202,7 @@ bool TDBDOS::OpenDB(PGLOBAL g)
|
||||
/***********************************************************************/
|
||||
int TDBDOS::ReadDB(PGLOBAL g)
|
||||
{
|
||||
if (trace > 1)
|
||||
if (trace(2))
|
||||
htrc("DOS ReadDB: R%d Mode=%d key=%p link=%p Kindex=%p To_Line=%p\n",
|
||||
GetTdb_No(), Mode, To_Key_Col, To_Link, To_Kindex, To_Line);
|
||||
|
||||
@@ -2227,7 +2227,7 @@ int TDBDOS::ReadDB(PGLOBAL g)
|
||||
if (SetRecpos(g, recpos))
|
||||
return RC_FX;
|
||||
|
||||
if (trace > 1)
|
||||
if (trace(2))
|
||||
htrc("File position is now %d\n", GetRecpos());
|
||||
|
||||
if (Mode == MODE_READ)
|
||||
@@ -2243,7 +2243,7 @@ int TDBDOS::ReadDB(PGLOBAL g)
|
||||
|
||||
} // endif To_Kindex
|
||||
|
||||
if (trace > 1)
|
||||
if (trace(2))
|
||||
htrc(" ReadDB: this=%p To_Line=%p\n", this, To_Line);
|
||||
|
||||
/*********************************************************************/
|
||||
@@ -2279,14 +2279,14 @@ bool TDBDOS::PrepareWriting(PGLOBAL)
|
||||
/***********************************************************************/
|
||||
int TDBDOS::WriteDB(PGLOBAL g)
|
||||
{
|
||||
if (trace > 1)
|
||||
if (trace(2))
|
||||
htrc("DOS WriteDB: R%d Mode=%d \n", Tdb_No, Mode);
|
||||
|
||||
// Make the line to write
|
||||
if (PrepareWriting(g))
|
||||
return RC_FX;
|
||||
|
||||
if (trace > 1)
|
||||
if (trace(2))
|
||||
htrc("Write: line is='%s'\n", To_Line);
|
||||
|
||||
// Now start the writing process
|
||||
@@ -2403,7 +2403,7 @@ DOSCOL::DOSCOL(PGLOBAL g, PCOLDEF cdp, PTDB tp, PCOL cp, int i, PCSZ am)
|
||||
Dcm = (*p) ? atoi(p) : GetScale();
|
||||
} // endif fmt
|
||||
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc(" making new %sCOL C%d %s at %p\n", am, Index, Name, this);
|
||||
|
||||
} // end of DOSCOL constructor
|
||||
@@ -2518,7 +2518,7 @@ void DOSCOL::ReadColumn(PGLOBAL g)
|
||||
double dval;
|
||||
PTDBDOS tdbp = (PTDBDOS)To_Tdb;
|
||||
|
||||
if (trace > 1)
|
||||
if (trace(2))
|
||||
htrc(
|
||||
"DOS ReadColumn: col %s R%d coluse=%.4X status=%.4X buf_type=%d\n",
|
||||
Name, tdbp->GetTdb_No(), ColUse, Status, Buf_Type);
|
||||
@@ -2607,13 +2607,13 @@ void DOSCOL::WriteColumn(PGLOBAL g)
|
||||
int i, k, len, field;
|
||||
PTDBDOS tdbp = (PTDBDOS)To_Tdb;
|
||||
|
||||
if (trace > 1)
|
||||
if (trace(2))
|
||||
htrc("DOS WriteColumn: col %s R%d coluse=%.4X status=%.4X\n",
|
||||
Name, tdbp->GetTdb_No(), ColUse, Status);
|
||||
|
||||
p = tdbp->To_Line + Deplac;
|
||||
|
||||
if (trace > 1)
|
||||
if (trace(2))
|
||||
htrc("Lrecl=%d deplac=%d int=%d\n", tdbp->Lrecl, Deplac, Long);
|
||||
|
||||
field = Long;
|
||||
@@ -2630,7 +2630,7 @@ void DOSCOL::WriteColumn(PGLOBAL g)
|
||||
|
||||
} // endif Ftype
|
||||
|
||||
if (trace > 1)
|
||||
if (trace(2))
|
||||
htrc("Long=%d field=%d coltype=%d colval=%p\n",
|
||||
Long, field, Buf_Type, Value);
|
||||
|
||||
@@ -2703,7 +2703,7 @@ void DOSCOL::WriteColumn(PGLOBAL g)
|
||||
} else // Standard CONNECT format
|
||||
p2 = Value->ShowValue(Buf, field);
|
||||
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("new length(%p)=%d\n", p2, strlen(p2));
|
||||
|
||||
if ((len = strlen(p2)) > field) {
|
||||
@@ -2714,7 +2714,7 @@ void DOSCOL::WriteColumn(PGLOBAL g)
|
||||
if (p2[i] == '.')
|
||||
p2[i] = Dsp;
|
||||
|
||||
if (trace > 1)
|
||||
if (trace(2))
|
||||
htrc("buffer=%s\n", p2);
|
||||
|
||||
/*******************************************************************/
|
||||
@@ -2724,7 +2724,7 @@ void DOSCOL::WriteColumn(PGLOBAL g)
|
||||
memset(p, ' ', field);
|
||||
memcpy(p, p2, len);
|
||||
|
||||
if (trace > 1)
|
||||
if (trace(2))
|
||||
htrc(" col write: '%.*s'\n", len, p);
|
||||
|
||||
} // endif Use
|
||||
|
||||
Reference in New Issue
Block a user