1 files changed, 57 insertions, 31 deletions

diff --git a/storage/connect/tabodbc.cpp b/storage/connect/tabodbc.cpp
index 65226c9e36f..0b05fc68299 100644
--- a/storage/connect/tabodbc.cpp
+++ b/storage/connect/tabodbc.cpp
@@ -100,7 +100,13 @@ ODBCDEF::ODBCDEF(void)
 /***********************************************************************/
 bool ODBCDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff)
   {
-  Desc = Connect = GetStringCatInfo(g, "Connect", "");
+  Desc = Connect = GetStringCatInfo(g, "Connect", NULL);
+
+  if (!Connect && !Catfunc) {
+    sprintf(g->Message, "Missing connection for ODBC table %s", Name);
+    return true;
+    } // endif Connect
+
   Tabname = GetStringCatInfo(g, "Name",
                  (Catfunc & (FNC_TABLE | FNC_COL)) ? NULL : Name);
   Tabname = GetStringCatInfo(g, "Tabname", Tabname);
@@ -108,7 +114,10 @@ bool ODBCDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff)
   Tabschema = GetStringCatInfo(g, "Schema", Tabschema);
   Tabcat = GetStringCatInfo(g, "Qualifier", NULL);
   Tabcat = GetStringCatInfo(g, "Catalog", Tabcat);
-  Srcdef = GetStringCatInfo(g, "Srcdef", NULL);
+
+  if ((Srcdef = GetStringCatInfo(g, "Srcdef", NULL)))
+    Read_Only = true;
+
   Qrystr = GetStringCatInfo(g, "Query_String", "?");
   Sep = GetStringCatInfo(g, "Separator", NULL);
   Catver = GetIntCatInfo("Catver", 2);
@@ -655,40 +664,57 @@ void TDBODBC::ResetSize(void)
   } // end of ResetSize
 
 /***********************************************************************/
+/*  ODBC Cardinality: returns table size in number of rows.            */
+/***********************************************************************/
+int TDBODBC::Cardinality(PGLOBAL g)
+  {
+  if (!g)
+    return (Mode == MODE_ANY && !Srcdef) ? 1 : 0;
+
+  if (Cardinal < 0 && Mode == MODE_ANY && !Srcdef) {
+    // Info command, we must return the exact table row number
+    char     qry[96], tbn[64];
+    ODBConn *ocp = new(g) ODBConn(g, this);
+
+    if (ocp->Open(Connect, Options) < 1)
+      return -1;
+
+    // Table name can be encoded in UTF-8
+    Decode(TableName, tbn, sizeof(tbn));
+    strcpy(qry, "SELECT COUNT(*) FROM ");
+
+    if (Quote)
+      strcat(strcat(strcat(qry, Quote), tbn), Quote);
+    else
+      strcat(qry, tbn);
+
+    // Allocate a Count(*) column (must not use the default constructor)
+    Cnp = new(g) ODBCCOL;
+    Cnp->InitValue(g);
+
+    if ((Cardinal = ocp->GetResultSize(qry, Cnp)) < 0)
+      return -3;
+
+    ocp->Close();
+    } // endif Cardinal
+
+  return Cardinal;
+  } // end of Cardinality
+
+/***********************************************************************/
 /*  ODBC GetMaxSize: returns table size estimate in number of lines.   */
 /***********************************************************************/
 int TDBODBC::GetMaxSize(PGLOBAL g)
   {
   if (MaxSize < 0) {
-    // Make MariaDB happy
-    MaxSize = (Mode == MODE_DELETE) ? 0 : 10;
-#if 0
-    // This is unuseful and takes time
-    if (Srcdef) {
-      // Return a reasonable guess
-      MaxSize = 100;
-      return MaxSize;
-      } // endif Srcdef
-
-    if (!Ocp)
-      Ocp = new(g) ODBConn(g, this);
-
-    if (!Ocp->IsOpen())
-      if (Ocp->Open(Connect, Options) < 1)
-        return -1;
-
-    if (!Count && !(Count = MakeSQL(g, true)))
-      return -2;
-
-    if (!Cnp) {
-      // Allocate a Count(*) column (must not use the default constructor)
-      Cnp = new(g) ODBCCOL;
-      Cnp->InitValue(g);
-      } // endif Cnp
-
-    if ((MaxSize = Ocp->GetResultSize(Count, Cnp)) < 0)
-      return -3;
-#endif // 0
+    if (Mode == MODE_DELETE)
+      // Return 0 in mode DELETE in case of delete all.
+      MaxSize = 0;
+    else if (!Cardinality(NULL))
+      MaxSize = 10;   // To make MySQL happy
+    else if ((MaxSize = Cardinality(g)) < 0)
+      MaxSize = 12;   // So we can see an error occured
+
     } // endif MaxSize
 
   return MaxSize;