summaryrefslogtreecommitdiff
path: root/storage/connect/tabxml.cpp
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2017-03-02 12:12:53 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2017-03-02 12:12:53 +0100
commitb2956b2ab437403f413b65f6fdaaf706847bc833 (patch)
tree3387eec2a227cb595512d60e477dbc168dcfc4fd /storage/connect/tabxml.cpp
parentd75e5e6e26c6581ce43403780242f275b6c35f5d (diff)
downloadmariadb-git-b2956b2ab437403f413b65f6fdaaf706847bc833.tar.gz
Update version number and date
modified: storage/connect/ha_connect.cc Add conditional SE exception support modified: storage/connect/json.cpp modified: storage/connect/plgdbutl.cpp Change %p in %x in some sprintf functions. This to avoid some compiler warnings. modified: storage/connect/tabwmi.cpp modified: storage/connect/tabxml.cpp modified: storage/connect/value.h Add JavaWrappers.jar to the class path modified: storage/connect/jdbconn.cpp Fix wrong declare (char *buf[256]; --> char buf[256];) modified: storage/connect/xindex.cpp
Diffstat (limited to 'storage/connect/tabxml.cpp')
-rw-r--r--storage/connect/tabxml.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/tabxml.cpp b/storage/connect/tabxml.cpp
index 8391a500f85..52cf3d3812f 100644
--- a/storage/connect/tabxml.cpp
+++ b/storage/connect/tabxml.cpp
@@ -931,7 +931,7 @@ bool TDBXML::Initialize(PGLOBAL g)
if (rc)
sprintf(g->Message, "%s: %s", MSG(COM_ERROR), buf);
else
- sprintf(g->Message, "%s hr=%p", MSG(COM_ERROR), e.Error());
+ sprintf(g->Message, "%s hr=%x", MSG(COM_ERROR), e.Error());
goto error;
#endif // __WIN__