diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2016-05-12 23:26:40 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2016-05-12 23:26:40 +0200 |
| commit | 4a1ffc3853dcbb279dfe3dce313d21b9ea1eb2f5 (patch) | |
| tree | 0016d21f5955b0b9247e1946229b2c6e33c9c803 /storage/connect/tabodbc.cpp | |
| parent | 5af076e564602559158db38a69a9cb4a09537986 (diff) | |
| download | mariadb-git-4a1ffc3853dcbb279dfe3dce313d21b9ea1eb2f5.tar.gz | |
Add forgotten changes made on 10.1
Diffstat (limited to 'storage/connect/tabodbc.cpp')
| -rw-r--r-- | storage/connect/tabodbc.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/connect/tabodbc.cpp b/storage/connect/tabodbc.cpp index b8961789ccd..b3b6c2919c0 100644 --- a/storage/connect/tabodbc.cpp +++ b/storage/connect/tabodbc.cpp @@ -97,8 +97,8 @@ ODBCDEF::ODBCDEF(void) { Connect = Tabname = Tabschema = Username = Password = NULL; Tabcat = Srcdef = Qchar = Qrystr = Sep = NULL; - Catver = Options = Cto = Qto = Quoted = Maxerr = Maxres = 0; - Scrollable = Memory = Xsrc = UseCnc = false; + Catver = Options = Cto = Qto = Quoted = Maxerr = Maxres = Memory = 0; + Scrollable = Xsrc = UseCnc = false; } // end of ODBCDEF constructor /***********************************************************************/ @@ -1009,7 +1009,7 @@ bool TDBODBC::SetRecpos(PGLOBAL g, int recpos) } // end of SetRecpos /***********************************************************************/ -/* Data Base indexed read routine for MYSQL access method. */ +/* Data Base indexed read routine for ODBC access method. */ /***********************************************************************/ bool TDBODBC::ReadKey(PGLOBAL g, OPVAL op, const key_range *kr) { @@ -1028,7 +1028,7 @@ bool TDBODBC::ReadKey(PGLOBAL g, OPVAL op, const key_range *kr) return false; } else { - if (To_Def->GetHandler()->MakeKeyWhere(g, Query, op, c, kr)) + if (hc->MakeKeyWhere(g, Query, op, c, kr)) return true; if (To_CondFil) { |