diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2013-02-20 01:30:37 +0100 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-02-20 01:30:37 +0100 |
commit | c448839c4fd3d097d0d7271ce4752b28d6f6e1f5 (patch) | |
tree | 41a0bc55190848d71f649b1aee3133fbc388d992 /storage/connect/myconn.h | |
parent | 2f48842a0fd61cfd3268293e64077bb7773dbea1 (diff) | |
download | mariadb-git-c448839c4fd3d097d0d7271ce4752b28d6f6e1f5.tar.gz |
- Fix crash on making an XML table with encoding=XXX
- Set parameters so libxml2 does not anymore add extra characters
when retrieving several subnodes of a node.
- Make a CONNECT file header (was PlugDB)
modified:
storage/connect/domdoc.cpp
storage/connect/libdoc.cpp
storage/connect/tabxml.cpp
- Change the version number
modified:
storage/connect/ha_connect.cc
- Begin eliminate use of libmysql functions in MYSQL table type
Not finished yet
modified:
storage/connect/myconn.cpp
storage/connect/myconn.h
Diffstat (limited to 'storage/connect/myconn.h')
-rw-r--r-- | storage/connect/myconn.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/myconn.h b/storage/connect/myconn.h index 1aab55f1e01..f5716dcfb33 100644 --- a/storage/connect/myconn.h +++ b/storage/connect/myconn.h @@ -62,8 +62,8 @@ class DllItem MYSQLC { int Open(PGLOBAL g, const char *host, const char *db, const char *user= "root", const char *pwd= "*", int pt= 0); - ulong GetThreadID(void); - ulong ServerVersion(void); +//ulong GetThreadID(void); +//ulong ServerVersion(void); const char *ServerInfo(void); int KillQuery(ulong id); int ExecSQL(PGLOBAL g, const char *query, int *w = NULL); |