Changeset: 308740ba0d1d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=308740ba0d1d
Modified Files:
        clients/src/mapiclient/mclient.mx
Branch: default
Log Message:

show a piece of the garbage we can't handle


diffs (32 lines):

diff -r 043bdedcd293 -r 308740ba0d1d clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Tue Aug 17 08:47:36 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Tue Aug 17 09:54:09 2010 +0200
@@ -1420,15 +1420,22 @@
                        break;
                default:
                        if (formatter == TABLEformatter) {
+                               int i;
                                mnstr_printf(stderr_stream,
                                                "invalid/unknown response from 
server, "
                                                "ignoring output\n");
-                               /* skip over the unknown/invalid stuff, 
otherwise
-                                * mapi_next_result call will assert in 
close_result
-                                * because the logic there doesn't expect 
random unread
-                                * garbage somehow */
-                               while (fetch_line(hdl) != 0)
-                                       ;
+                               for (i = 0; i < 5 && (reply = fetch_line(hdl)) 
!= 0; i++)
+                                       mnstr_printf(stderr_stream, "? %s\n", 
reply);
+                               if (i == 5 && fetch_line(hdl) != 0) {
+                                       mnstr_printf(stderr_stream, "(remaining 
output omitted, "
+                                                       "use \\fraw to examine 
in detail)\n");
+                                       /* skip over the unknown/invalid stuff, 
otherwise
+                                        * mapi_next_result call will assert in 
close_result
+                                        * because the logic there doesn't 
expect random unread
+                                        * garbage somehow */
+                                       while (fetch_line(hdl) != 0)
+                                               ;
+                               }
                                continue;
                        }
                }
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to