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
@@ -337,7 +337,7 @@ PVAL AllocateValue(PGLOBAL g, void *value, short type, short prec)
|
||||
{
|
||||
PVAL valp;
|
||||
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("AllocateConstant: value=%p type=%hd\n", value, type);
|
||||
|
||||
switch (type) {
|
||||
@@ -727,7 +727,7 @@ bool TYPVAL<TYPE>::SetValue_char(const char *p, int n)
|
||||
else
|
||||
Tval = (TYPE)val;
|
||||
|
||||
if (trace > 1) {
|
||||
if (trace(2)) {
|
||||
char buf[64];
|
||||
htrc(strcat(strcat(strcpy(buf, " setting %s to: "), Fmt), "\n"),
|
||||
GetTypeName(Type), Tval);
|
||||
@@ -750,7 +750,7 @@ bool TYPVAL<double>::SetValue_char(const char *p, int n)
|
||||
buf[n] = '\0';
|
||||
Tval = atof(buf);
|
||||
|
||||
if (trace > 1)
|
||||
if (trace(2))
|
||||
htrc(" setting double: '%s' -> %lf\n", buf, Tval);
|
||||
|
||||
Null = false;
|
||||
@@ -996,7 +996,7 @@ int TYPVAL<TYPE>::CompareValue(PVAL vp)
|
||||
// Process filtering on numeric values.
|
||||
TYPE n = GetTypedValue(vp);
|
||||
|
||||
//if (trace)
|
||||
//if (trace(1))
|
||||
// htrc(" Comparing: val=%d,%d\n", Tval, n);
|
||||
|
||||
return (Tval > n) ? 1 : (Tval < n) ? (-1) : 0;
|
||||
@@ -1384,7 +1384,7 @@ bool TYPVAL<PSZ>::SetValue_char(const char *cp, int n)
|
||||
strncpy(Strp, cp, n);
|
||||
Strp[n] = '\0';
|
||||
|
||||
if (trace > 1)
|
||||
if (trace(2))
|
||||
htrc(" Setting string to: '%s'\n", Strp);
|
||||
|
||||
} else
|
||||
@@ -1631,7 +1631,7 @@ int TYPVAL<PSZ>::CompareValue(PVAL vp)
|
||||
int n;
|
||||
//assert(vp->GetType() == Type);
|
||||
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc(" Comparing: val='%s','%s'\n", Strp, vp->GetCharValue());
|
||||
|
||||
// Process filtering on character strings.
|
||||
@@ -1656,14 +1656,14 @@ bool TYPVAL<PSZ>::Compute(PGLOBAL g, PVAL *vp, int np, OPVAL op)
|
||||
char *p[2], val[2][32];
|
||||
int i;
|
||||
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("Compute: np=%d op=%d\n", np, op);
|
||||
|
||||
for (i = 0; i < np; i++)
|
||||
if (!vp[i]->IsNull()) {
|
||||
p[i] = vp[i]->GetCharString(val[i]);
|
||||
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("p[%d]=%s\n", i, p[i]);
|
||||
|
||||
} else
|
||||
@@ -1679,7 +1679,7 @@ bool TYPVAL<PSZ>::Compute(PGLOBAL g, PVAL *vp, int np, OPVAL op)
|
||||
if ((i = Len - (signed)strlen(Strp)) > 0)
|
||||
strncat(Strp, p[np - 1], i);
|
||||
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("Strp=%s\n", Strp);
|
||||
|
||||
break;
|
||||
@@ -1854,7 +1854,7 @@ int DECVAL::CompareValue(PVAL vp)
|
||||
// Process filtering on numeric values.
|
||||
double f = atof(Strp), n = vp->GetFloatValue();
|
||||
|
||||
//if (trace)
|
||||
//if (trace(1))
|
||||
// htrc(" Comparing: val=%d,%d\n", f, n);
|
||||
|
||||
return (f > n) ? 1 : (f < n) ? (-1) : 0;
|
||||
@@ -2410,7 +2410,7 @@ void DTVAL::SetTimeShift(void)
|
||||
|
||||
Shift = (int)mktime(&dtm) - 86400;
|
||||
|
||||
if (trace)
|
||||
if (trace(1))
|
||||
htrc("DTVAL Shift=%d\n", Shift);
|
||||
|
||||
} // end of SetTimeShift
|
||||
@@ -2485,7 +2485,7 @@ bool DTVAL::MakeTime(struct tm *ptm)
|
||||
int n, y = ptm->tm_year;
|
||||
time_t t = mktime_mysql(ptm);
|
||||
|
||||
if (trace > 1)
|
||||
if (trace(2))
|
||||
htrc("MakeTime from (%d,%d,%d,%d,%d,%d)\n",
|
||||
ptm->tm_year, ptm->tm_mon, ptm->tm_mday,
|
||||
ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
|
||||
@@ -2508,7 +2508,7 @@ bool DTVAL::MakeTime(struct tm *ptm)
|
||||
}
|
||||
Tval= (int) t;
|
||||
|
||||
if (trace > 1)
|
||||
if (trace(2))
|
||||
htrc("MakeTime Ival=%d\n", Tval);
|
||||
|
||||
return false;
|
||||
@@ -2528,14 +2528,14 @@ bool DTVAL::MakeDate(PGLOBAL g, int *val, int nval)
|
||||
datm.tm_mon=0;
|
||||
datm.tm_year=70;
|
||||
|
||||
if (trace > 1)
|
||||
if (trace(2))
|
||||
htrc("MakeDate from(%d,%d,%d,%d,%d,%d) nval=%d\n",
|
||||
val[0], val[1], val[2], val[3], val[4], val[5], nval);
|
||||
|
||||
for (i = 0; i < nval; i++) {
|
||||
n = val[i];
|
||||
|
||||
// if (trace > 1)
|
||||
// if (trace(2))
|
||||
// htrc("i=%d n=%d\n", i, n);
|
||||
|
||||
switch (i) {
|
||||
@@ -2545,7 +2545,7 @@ bool DTVAL::MakeDate(PGLOBAL g, int *val, int nval)
|
||||
|
||||
datm.tm_year = n;
|
||||
|
||||
// if (trace > 1)
|
||||
// if (trace(2))
|
||||
// htrc("n=%d tm_year=%d\n", n, datm.tm_year);
|
||||
|
||||
break;
|
||||
@@ -2564,7 +2564,7 @@ bool DTVAL::MakeDate(PGLOBAL g, int *val, int nval)
|
||||
datm.tm_mon = m;
|
||||
datm.tm_year += n;
|
||||
|
||||
// if (trace > 1)
|
||||
// if (trace(2))
|
||||
// htrc("n=%d m=%d tm_year=%d tm_mon=%d\n", n, m, datm.tm_year, datm.tm_mon);
|
||||
|
||||
break;
|
||||
@@ -2581,7 +2581,7 @@ bool DTVAL::MakeDate(PGLOBAL g, int *val, int nval)
|
||||
datm.tm_mday = m;
|
||||
datm.tm_year += n;
|
||||
|
||||
// if (trace > 1)
|
||||
// if (trace(2))
|
||||
// htrc("n=%d m=%d tm_year=%d tm_mon=%d\n", n, m, datm.tm_year, datm.tm_mon);
|
||||
|
||||
break;
|
||||
@@ -2592,7 +2592,7 @@ bool DTVAL::MakeDate(PGLOBAL g, int *val, int nval)
|
||||
|
||||
} // endfor i
|
||||
|
||||
if (trace > 1)
|
||||
if (trace(2))
|
||||
htrc("MakeDate datm=(%d,%d,%d,%d,%d,%d)\n",
|
||||
datm.tm_year, datm.tm_mon, datm.tm_mday,
|
||||
datm.tm_hour, datm.tm_min, datm.tm_sec);
|
||||
@@ -2667,7 +2667,7 @@ bool DTVAL::SetValue_char(const char *p, int n)
|
||||
ndv = ExtractDate(Sdate, Pdtp, DefYear, dval);
|
||||
MakeDate(NULL, dval, ndv);
|
||||
|
||||
if (trace > 1)
|
||||
if (trace(2))
|
||||
htrc(" setting date: '%s' -> %d\n", Sdate, Tval);
|
||||
|
||||
Null = (Nullable && ndv == 0);
|
||||
@@ -2694,7 +2694,7 @@ void DTVAL::SetValue_psz(PCSZ p)
|
||||
ndv = ExtractDate(Sdate, Pdtp, DefYear, dval);
|
||||
MakeDate(NULL, dval, ndv);
|
||||
|
||||
if (trace > 1)
|
||||
if (trace(2))
|
||||
htrc(" setting date: '%s' -> %d\n", Sdate, Tval);
|
||||
|
||||
Null = (Nullable && ndv == 0);
|
||||
@@ -2849,13 +2849,13 @@ bool DTVAL::FormatValue(PVAL vp, PCSZ fmt)
|
||||
char *buf = (char*)vp->GetTo_Val(); // Should be big enough
|
||||
struct tm tm, *ptm = GetGmTime(&tm);
|
||||
|
||||
if (trace > 1)
|
||||
if (trace(2))
|
||||
htrc("FormatValue: ptm=%p len=%d\n", ptm, vp->GetValLen());
|
||||
|
||||
if (ptm) {
|
||||
size_t n = strftime(buf, vp->GetValLen(), fmt, ptm);
|
||||
|
||||
if (trace > 1)
|
||||
if (trace(2))
|
||||
htrc("strftime: n=%d buf=%s\n", n, (n) ? buf : "???");
|
||||
|
||||
return (n == 0);
|
||||
|
||||
Reference in New Issue
Block a user