Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1

client/mysql.cc

@@ -44,7 +44,7 @@
 #include <locale.h>
 #endif
 
-const char *VER= "14.2";
+const char *VER= "14.3";
 
 /* Don't try to make a nice table if the data is too big */
 #define MAX_COLUMN_LENGTH	     1024
@@ -1665,10 +1665,11 @@ com_go(String *buffer,char *line __attribute__((unused)))
     buffer->length(0); // Remove query on error
     return error;
   }
-
   error=0;
   buffer->length(0);
 
+  do
+  {
     if (quick)
     {
       if (!(result=mysql_use_result(&mysql)) && mysql_field_count(&mysql))
@@ -1738,6 +1739,8 @@ com_go(String *buffer,char *line __attribute__((unused)))
     else if (unbuffered)
       fflush(stdout);
     mysql_free_result(result);
+  } while (!mysql_next_result(&mysql));
+
   return error;				/* New command follows */
 }
 
@@ -2416,6 +2419,7 @@ com_delimiter(String *buffer __attribute__((unused)), char *line)
   }
   strmake(delimiter, tmp, sizeof(delimiter) - 1);
   delimiter_length= strlen(delimiter);
+  delimiter_str= delimiter;
   return 0;
 }