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
@@ -134,7 +134,7 @@ bool TDBMUL::InitFileNames(PGLOBAL g)
|
||||
PSZ filename;
|
||||
int rc, n = 0;
|
||||
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("in InitFileName: fn[]=%d\n", FNSZ);
|
||||
|
||||
filename = (char*)PlugSubAlloc(g, NULL, FNSZ);
|
||||
@@ -144,7 +144,7 @@ bool TDBMUL::InitFileNames(PGLOBAL g)
|
||||
|
||||
PlugSetPath(filename, Tdbp->GetFile(g), Tdbp->GetPath());
|
||||
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("InitFileName: fn='%s'\n", filename);
|
||||
|
||||
if (Mul != 2) {
|
||||
@@ -159,7 +159,7 @@ bool TDBMUL::InitFileNames(PGLOBAL g)
|
||||
if (dirp->OpenDB(g))
|
||||
return true;
|
||||
|
||||
if (trace && Mul == 3) {
|
||||
if (trace(1) && Mul == 3) {
|
||||
int nf = ((PTDBSDR)dirp)->FindInDir(g);
|
||||
htrc("Number of files = %d\n", nf);
|
||||
} // endif trace
|
||||
@@ -319,7 +319,7 @@ int TDBMUL::GetMaxSize(PGLOBAL g)
|
||||
int i;
|
||||
int mxsz;
|
||||
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("TDBMUL::GetMaxSize: Filenames=%p\n", Filenames);
|
||||
|
||||
if (!Filenames && InitFileNames(g))
|
||||
@@ -375,7 +375,7 @@ int TDBMUL::RowNumber(PGLOBAL g, bool b)
|
||||
/***********************************************************************/
|
||||
bool TDBMUL::OpenDB(PGLOBAL g)
|
||||
{
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("MUL OpenDB: tdbp=%p tdb=R%d use=%d key=%p mode=%d\n",
|
||||
this, Tdb_No, Use, To_Key_Col, Mode);
|
||||
|
||||
@@ -546,7 +546,7 @@ bool TDBMSD::InitFileNames(PGLOBAL g)
|
||||
PSZ filename;
|
||||
int rc, n = 0;
|
||||
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("in InitFileName: fn[]=%d\n", FNSZ);
|
||||
|
||||
filename = (char*)PlugSubAlloc(g, NULL, FNSZ);
|
||||
@@ -556,7 +556,7 @@ bool TDBMSD::InitFileNames(PGLOBAL g)
|
||||
|
||||
PlugSetPath(filename, Tdbp->GetFile(g), Tdbp->GetPath());
|
||||
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("InitFileName: fn='%s'\n", filename);
|
||||
|
||||
dirp = new(g) TDBSDR(filename);
|
||||
@@ -787,7 +787,7 @@ int TDBDIR::GetMaxSize(PGLOBAL g)
|
||||
/***********************************************************************/
|
||||
bool TDBDIR::OpenDB(PGLOBAL g)
|
||||
{
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("DIR OpenDB: tdbp=%p tdb=R%d use=%d mode=%d\n",
|
||||
this, Tdb_No, Use, Mode);
|
||||
|
||||
@@ -985,7 +985,7 @@ void DIRCOL::SetTimeValue(PGLOBAL g, FILETIME& ftime)
|
||||
/***********************************************************************/
|
||||
void DIRCOL::ReadColumn(PGLOBAL g)
|
||||
{
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("DIR ReadColumn: col %s R%d use=%.4X status=%.4X type=%d N=%d\n",
|
||||
Name, Tdbp->GetTdb_No(), ColUse, Status, Buf_Type, N);
|
||||
|
||||
@@ -1452,7 +1452,7 @@ int TDBDHR::GetMaxSize(PGLOBAL g)
|
||||
/***********************************************************************/
|
||||
bool TDBDHR::OpenDB(PGLOBAL g)
|
||||
{
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("DHR OpenDB: tdbp=%p tdb=R%d use=%d mode=%d\n",
|
||||
this, Tdb_No, Use, Mode);
|
||||
|
||||
@@ -1589,7 +1589,7 @@ void DHRCOL::ReadColumn(PGLOBAL g)
|
||||
int rc;
|
||||
PTDBDHR tdbp = (PTDBDHR)To_Tdb;
|
||||
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("DHR ReadColumn: col %s R%d use=%.4X status=%.4X type=%d N=%d\n",
|
||||
Name, tdbp->GetTdb_No(), ColUse, Status, Buf_Type, N);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user