diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2013-11-11 13:00:39 +0100 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-11-11 13:00:39 +0100 |
commit | eca84a9b1837304ce4be50994ef7077b31ccf50c (patch) | |
tree | 93b406318c6add4f93cf93ee9fb96fd15cea970f /storage/connect/odbconn.cpp | |
parent | e5c589a8da02211e3b0ac9ad8a785c4669b63fda (diff) | |
download | mariadb-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.cpp')
-rw-r--r-- | storage/connect/odbconn.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/storage/connect/odbconn.cpp b/storage/connect/odbconn.cpp index 04ec147d91c..c6a6fe0ed02 100644 --- a/storage/connect/odbconn.cpp +++ b/storage/connect/odbconn.cpp @@ -873,7 +873,8 @@ ODBConn::ODBConn(PGLOBAL g, TDBODBC *tdbp) m_Connect = NULL; m_Updatable = true; m_Transact = false; - m_IDQuoteChar = '\''; + m_IDQuoteChar[0] = '"'; + m_IDQuoteChar[1] = 0; //*m_ErrMsg = '\0'; } // end of ODBConn @@ -1232,16 +1233,9 @@ void ODBConn::GetConnectInfo() SQL_MODE_READ_ONLY); #endif // 0 - // Cache the quote char to use when constructing SQL - char QuoteChar[2]; - + // Get the quote char to use when constructing SQL rc = SQLGetInfo(m_hdbc, SQL_IDENTIFIER_QUOTE_CHAR, - QuoteChar, sizeof(QuoteChar), &nResult); - - if (Check(rc) && nResult == 1) - m_IDQuoteChar = QuoteChar[0]; - else - m_IDQuoteChar = ' '; + m_IDQuoteChar, sizeof(m_IDQuoteChar), &nResult); if (trace) htrc("DBMS: %s, Version: %s\n", |