diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2013-10-26 00:43:03 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-10-26 00:43:03 +0200 |
| commit | ba3f4a2cc9ec5337f7677def0a1366cbb7332922 (patch) | |
| tree | c125f165a39d3c283e6a0dba698b12cb4b64886f /storage/connect/tabodbc.cpp | |
| parent | c0907d57b1493e75ac16d8b24cb91a644f078750 (diff) | |
| download | mariadb-git-ba3f4a2cc9ec5337f7677def0a1366cbb7332922.tar.gz | |
- Add new features to ODBC table type
Srcdef definition
Execute command tables
uncomplete connect string
modified:
storage/connect/ha_connect.cc
storage/connect/odbccat.h
storage/connect/odbconn.cpp
storage/connect/odbconn.h
storage/connect/plgdbsem.h
storage/connect/plgdbutl.cpp
storage/connect/tabodbc.cpp
Diffstat (limited to 'storage/connect/tabodbc.cpp')
| -rw-r--r-- | storage/connect/tabodbc.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/storage/connect/tabodbc.cpp b/storage/connect/tabodbc.cpp index 38699b9d8e5..d9d794ef4e4 100644 --- a/storage/connect/tabodbc.cpp +++ b/storage/connect/tabodbc.cpp @@ -100,8 +100,6 @@ ODBCDEF::ODBCDEF(void) /***********************************************************************/ bool ODBCDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff) { - int dop = ODBConn::noOdbcDialog; // Default for options - Desc = Connect = Cat->GetStringCatInfo(g, "Connect", ""); Tabname = Cat->GetStringCatInfo(g, "Name", (Catfunc & (FNC_TABLE | FNC_COL)) ? NULL : Name); @@ -111,8 +109,8 @@ bool ODBCDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff) Srcdef = Cat->GetStringCatInfo(g, "Srcdef", NULL); Qchar = Cat->GetStringCatInfo(g, "Qchar", ""); Catver = Cat->GetIntCatInfo("Catver", 2); - Options = Cat->GetIntCatInfo("Options", dop); Xsrc = Cat->GetBoolCatInfo("Execsrc", FALSE); + Options = ODBConn::noOdbcDialog; Pseudo = 2; // FILID is Ok but not ROWID return false; } // end of DefineAM @@ -534,8 +532,12 @@ void TDBODBC::ResetSize(void) int TDBODBC::GetMaxSize(PGLOBAL g) { if (MaxSize < 0) { + // Make MariaDB happy + MaxSize = 100; +#if 0 + // This is unuseful and takes time if (Srcdef) { - // Give a reasonable guess + // Return a reasonable guess MaxSize = 100; return MaxSize; } // endif Srcdef @@ -558,7 +560,7 @@ int TDBODBC::GetMaxSize(PGLOBAL g) if ((MaxSize = Ocp->GetResultSize(Count, Cnp)) < 0) return -3; - +#endif // 0 } // endif MaxSize return MaxSize; |