summaryrefslogtreecommitdiff
path: root/storage/connect/plgdbutl.cpp
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2014-02-16 18:05:43 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2014-02-16 18:05:43 +0100
commitad9d7e8561296a5579c241fd96fa5f1cd8a501d5 (patch)
treed64000a299db4513411fec9b381713286d1857c3 /storage/connect/plgdbutl.cpp
parente1096934d7c9222691789d57c5c3754bcd3560dc (diff)
downloadmariadb-git-ad9d7e8561296a5579c241fd96fa5f1cd8a501d5.tar.gz
# This is a minor change commitment
- Fix accidental crash when closing domdoc xml table modified: storage/connect/domdoc.cpp - Update table and index flags. Correct version number in maria_declare_plugin. modified: storage/connect/ha_connect.cc storage/connect/ha_connect.h storage/connect/mycat.cc storage/connect/mycat.h - Fix syntax error when getting columns of a non-select srcdef (discovery) modified: storage/connect/myconn.cpp - Update some tests and result according to new flag setting modified: storage/connect/mysql-test/connect/r/alter.result storage/connect/mysql-test/connect/r/dbf.result storage/connect/mysql-test/connect/t/dbf.test - Change some tracing tests to avoid too much test printed modified: storage/connect/plgdbutl.cpp storage/connect/tabutil.cpp storage/connect/value.cpp
Diffstat (limited to 'storage/connect/plgdbutl.cpp')
-rw-r--r--storage/connect/plgdbutl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/plgdbutl.cpp b/storage/connect/plgdbutl.cpp
index c3c74463271..c51100e0141 100644
--- a/storage/connect/plgdbutl.cpp
+++ b/storage/connect/plgdbutl.cpp
@@ -853,7 +853,7 @@ int ExtractDate(char *dts, PDTP pdp, int defy, int val[6])
else // assume standard MySQL date format
fmt = "%4d-%2d-%2d %2d:%2d:%2d";
- if (trace)
+ if (trace > 1)
htrc("ExtractDate: dts=%s fmt=%s defy=%d\n", dts, fmt, defy);
// Set default values for time only use
@@ -935,7 +935,7 @@ int ExtractDate(char *dts, PDTP pdp, int defy, int val[6])
} // endfor i
- if (trace)
+ if (trace > 1)
htrc("numval=%d val=(%d,%d,%d,%d,%d,%d)\n",
numval, val[0], val[1], val[2], val[3], val[4], val[5]);