- 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

1 files changed, 11 insertions, 11 deletions

diff --git a/storage/connect/tabjdbc.cpp b/storage/connect/tabjdbc.cpp
index b6a1487955b..c0fda584381 100644
--- a/storage/connect/tabjdbc.cpp
+++ b/storage/connect/tabjdbc.cpp
@@ -153,7 +153,7 @@ int JDBCDEF::ParseURL(PGLOBAL g, char *url, bool b)
 //	  Tabname = GetStringCatInfo(g, "Tabname", Tabname);
 		} // endif
 
-		if (trace)
+		if (trace(1))
 			htrc("server: %s Tabname: %s", url, Tabname);
 
 		// Now make the required URL
@@ -470,7 +470,7 @@ bool TDBJDBC::MakeInsert(PGLOBAL g)
 	else
 		Prepared = true;
 
-	if (trace)
+	if (trace(33))
 		htrc("Insert=%s\n", Query->GetStr());
 
 	return false;
@@ -553,7 +553,7 @@ bool TDBJDBC::OpenDB(PGLOBAL g)
 {
 	bool rc = true;
 
-	if (trace)
+	if (trace(1))
 		htrc("JDBC OpenDB: tdbp=%p tdb=R%d use=%d mode=%d\n",
 		     this, Tdb_No, Use, Mode);
 
@@ -767,7 +767,7 @@ bool TDBJDBC::ReadKey(PGLOBAL g, OPVAL op, const key_range *kr)
 		Mode = MODE_READ;
 	} // endif's op
 
-	if (trace)
+	if (trace(33))
 		htrc("JDBC ReadKey: Query=%s\n", Query->GetStr());
 
 	rc = Jcp->ExecuteQuery((char*)Query->GetStr());
@@ -783,7 +783,7 @@ int TDBJDBC::ReadDB(PGLOBAL g)
 {
 	int  rc;
 
-	if (trace > 1)
+	if (trace(2))
 		htrc("JDBC ReadDB: R%d Mode=%d\n", GetTdb_No(), Mode);
 
 	if (Mode == MODE_UPDATE || Mode == MODE_DELETE) {
@@ -836,7 +836,7 @@ int TDBJDBC::ReadDB(PGLOBAL g)
 
 	} // endif placed
 
-	if (trace > 1)
+	if (trace(2))
 		htrc(" Read: Rbuf=%d rc=%d\n", Rbuf, rc);
 
 	return rc;
@@ -897,7 +897,7 @@ int TDBJDBC::WriteDB(PGLOBAL g)
 
 	Query->RepLast(')');
 
-	if (trace > 1)
+	if (trace(2))
 		htrc("Inserting: %s\n", Query->GetStr());
 
 	rc = Jcp->ExecuteUpdate(Query->GetStr());
@@ -925,7 +925,7 @@ int TDBJDBC::DeleteDB(PGLOBAL g, int irc)
 			AftRows = Jcp->m_Aff;
 			sprintf(g->Message, "%s: %d affected rows", TableName, AftRows);
 
-			if (trace)
+			if (trace(1))
 				htrc("%s\n", g->Message);
 
 			PushWarning(g, this, 0);    // 0 means a Note
@@ -946,14 +946,14 @@ void TDBJDBC::CloseDB(PGLOBAL g)
 	if (Jcp)
 		Jcp->Close();
 
-	if (trace)
+	if (trace(1))
 		htrc("JDBC CloseDB: closing %s\n", Name);
 
 	if (!Werr && 
 		(Mode == MODE_INSERT || Mode == MODE_UPDATE || Mode == MODE_DELETE)) {
 		sprintf(g->Message, "%s: %d affected rows", TableName, AftRows);
 
-		if (trace)
+		if (trace(1))
 			htrc("%s\n", g->Message);
 
 		PushWarning(g, this, 0);    // 0 means a Note
@@ -1117,7 +1117,7 @@ bool TDBXJDC::OpenDB(PGLOBAL g)
 {
 	bool rc = false;
 
-	if (trace)
+	if (trace(1))
 		htrc("JDBC OpenDB: tdbp=%p tdb=R%d use=%d mode=%d\n",
 		this, Tdb_No, Use, Mode);