summaryrefslogtreecommitdiff
path: root/storage/connect/myconn.cpp
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2013-02-20 01:30:37 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2013-02-20 01:30:37 +0100
commitc448839c4fd3d097d0d7271ce4752b28d6f6e1f5 (patch)
tree41a0bc55190848d71f649b1aee3133fbc388d992 /storage/connect/myconn.cpp
parent2f48842a0fd61cfd3268293e64077bb7773dbea1 (diff)
downloadmariadb-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.cpp')
-rw-r--r--storage/connect/myconn.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/storage/connect/myconn.cpp b/storage/connect/myconn.cpp
index 027d37b86c6..dd41b16c411 100644
--- a/storage/connect/myconn.cpp
+++ b/storage/connect/myconn.cpp
@@ -328,6 +328,7 @@ bool MYSQLC::Connected(void)
} // end of Connected
+#if 0 // Not used
/***********************************************************************/
/* Returns the thread ID of the current MySQL connection. */
/***********************************************************************/
@@ -345,14 +346,15 @@ const char *MYSQLC::ServerInfo(void)
} // end of ServerInfo
/***********************************************************************/
-/* Returns the version number of the server as a number that */
-/* represents the MySQL server version in this format: */
+/* Returns the version number of the server as a number that */
+/* represents the MySQL server version in this format: */
/* major_version*10000 + minor_version *100 + sub_version */
/***********************************************************************/
ulong MYSQLC::ServerVersion(void)
{
return (m_DB) ? mysql_get_server_version(m_DB) : 0;
} // end of ServerVersion
+#endif // 0
/**************************************************************************/
/* KillQuery: Send MySQL a Kill Query command. */
@@ -421,7 +423,8 @@ int MYSQLC::ExecSQL(PGLOBAL g, const char *query, int *w)
if (m_Rows >= 0)
return RC_OK; // Already done
- if (mysql_query(m_DB, query) != 0) {
+//if (mysql_query(m_DB, query) != 0) {
+ if (mysql_real_query(m_DB, query, strlen(query))) {
char *msg = (char*)PlugSubAlloc(g, NULL, 512 + strlen(query));
sprintf(msg, "(%d) %s [%s]", mysql_errno(m_DB),