- Temporary fix for MDEV-7304.

modified:
  storage/connect/rcmsg.c

- Avoid Memory copying when reading an ODBC table when the entire table
  is already in the result set.
modified:
  storage/connect/odbconn.cpp
  storage/connect/odbconn.h
  storage/connect/tabodbc.cpp
  storage/connect/tabodbc.h

1 files changed, 3 insertions, 3 deletions

diff --git a/storage/connect/tabodbc.cpp b/storage/connect/tabodbc.cpp
index 6608083f1b4..ee137187af8 100644
--- a/storage/connect/tabodbc.cpp
+++ b/storage/connect/tabodbc.cpp
@@ -95,7 +95,7 @@ ODBCDEF::ODBCDEF(void)
   {
   Connect= Tabname= Tabschema= Tabcat= Srcdef= Qchar= Qrystr= Sep= NULL;
   Catver = Options = Quoted = Maxerr = Maxres = 0;
-  Scrollable = Xsrc = false;
+  Scrollable = Memory = Xsrc = false;
   }  // end of ODBCDEF constructor
 
 /***********************************************************************/
@@ -880,7 +880,7 @@ int TDBODBC::ReadDB(PGLOBAL g)
   if (To_Kindex) {
     // Direct access of ODBC tables is not implemented yet
     strcpy(g->Message, MSG(NO_ODBC_DIRECT));
-    longjmp(g->jumper[g->jump_level], GetAmType());
+    return RC_FX;
     } // endif To_Kindex
 
   /*********************************************************************/
@@ -1152,7 +1152,7 @@ void ODBCCOL::ReadColumn(PGLOBAL g)
       Name, tdbp->Rows, Bufp, Buf_Type, Value->GetCharString(buf));
     } // endif Trace
 
-put:
+ put:
   if (tdbp->Memory != 2)
     return;