1 files changed, 14 insertions, 3 deletions
diff --git a/storage/connect/table.cpp b/storage/connect/table.cpp
index 2d6a6d8dc64..efe203e8e75 100644
--- a/storage/connect/table.cpp
+++ b/storage/connect/table.cpp
@@ -478,6 +478,16 @@ bool TDBCAT::Initialize(PGLOBAL g)
   if (!(Qrp = GetResult(g)))
     return true;
 
+  if (Qrp->Truncated) {
+    sprintf(g->Message, "Result limited to %d lines", Qrp->Maxres);
+    PushWarning(g, this);
+    } // endif Truncated
+
+  if (Qrp->BadLines) {
+    sprintf(g->Message, "%d bad lines in result", Qrp->BadLines);
+    PushWarning(g, this);
+    } // endif Badlines
+
 	Init = true;
 	return false;
 	} // end of Initialize
@@ -488,10 +498,11 @@ bool TDBCAT::Initialize(PGLOBAL g)
 int TDBCAT::GetMaxSize(PGLOBAL g)
   {
   if (MaxSize < 0) {
-    if (Initialize(g))
-      return -1;
+//  if (Initialize(g))
+//    return -1;
 
-    MaxSize = Qrp->Nblin;
+//  MaxSize = Qrp->Nblin;
+    MaxSize = 10;             // To make MariaDB happy
     } // endif MaxSize
 
   return MaxSize;