summaryrefslogtreecommitdiff
path: root/storage/connect/odbconn.h
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2013-11-11 13:00:39 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2013-11-11 13:00:39 +0100
commiteca84a9b1837304ce4be50994ef7077b31ccf50c (patch)
tree93b406318c6add4f93cf93ee9fb96fd15cea970f /storage/connect/odbconn.h
parente5c589a8da02211e3b0ac9ad8a785c4669b63fda (diff)
downloadmariadb-git-eca84a9b1837304ce4be50994ef7077b31ccf50c.tar.gz
- Add (limited) support for UPDATE and DELETE to ODBC tables
(also provide the possibility to issue NOTE warnings) modified: storage/connect/connect.cc storage/connect/ha_connect.cc storage/connect/ha_connect.h storage/connect/odbconn.cpp storage/connect/odbconn.h storage/connect/plgdbsem.h storage/connect/tabodbc.cpp storage/connect/tabodbc.h - Return proper error number when modifying read only tables modified: storage/connect/connect.cc storage/connect/ha_connect.cc storage/connect/ha_connect.h storage/connect/mysql-test/connect/r/bin.result storage/connect/mysql-test/connect/r/csv.result storage/connect/mysql-test/connect/r/dbf.result storage/connect/mysql-test/connect/r/fix.result storage/connect/mysql-test/connect/r/ini.result storage/connect/mysql-test/connect/r/vec.result storage/connect/mysql-test/connect/t/bin.test storage/connect/mysql-test/connect/t/csv.test storage/connect/mysql-test/connect/t/dbf.test storage/connect/mysql-test/connect/t/fix.test storage/connect/mysql-test/connect/t/ini.test storage/connect/mysql-test/connect/t/vec.test storage/connect/table.cpp storage/connect/taboccur.cpp storage/connect/tabpivot.cpp storage/connect/tabutil.cpp storage/connect/tabwmi.cpp storage/connect/tabxcl.cpp
Diffstat (limited to 'storage/connect/odbconn.h')
-rw-r--r--storage/connect/odbconn.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/odbconn.h b/storage/connect/odbconn.h
index b747a07f439..9b8f2d100f4 100644
--- a/storage/connect/odbconn.h
+++ b/storage/connect/odbconn.h
@@ -127,7 +127,7 @@ class ODBConn : public BLOCK {
// Attributes
public:
- char GetQuoteChar(void) {return m_IDQuoteChar;}
+ char *GetQuoteChar(void) {return m_IDQuoteChar;}
// Database successfully opened?
bool IsOpen(void) {return m_hdbc != SQL_NULL_HDBC;}
PSZ GetStringInfo(ushort infotype);
@@ -184,9 +184,9 @@ class ODBConn : public BLOCK {
DWORD m_QueryTimeout;
DWORD m_UpdateOptions;
DWORD m_RowsetSize;
+ char m_IDQuoteChar[2];
int m_Catver;
PSZ m_Connect;
bool m_Updatable;
bool m_Transact;
- char m_IDQuoteChar;
}; // end of ODBConn class definition