Commit 7a8f8733 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0-maint 

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


tests/mysql_client_test.c:
  Auto merged
parents 3468780e d36b0cdf

client/mysqltest.c

+0 −3
Original line number Diff line number Diff line
@@ -4957,9 +4957,6 @@ int main(int argc, char **argv) 
    die("No queries executed but result file found!");

  }





  dynstr_free(&ds_res);



  if (!got_end_timer)

    timer_output();				/* No end_timer cmd, end it */

  free_used_memory();

tests/mysql_client_test.c

+2 −0
Original line number Diff line number Diff line
@@ -14975,6 +14975,8 @@ static void test_bug17667() 
            DIE("Read error");

          }

        }

        /* Print the line */

        printf("%s", line_buffer);



      } while (my_memmem(line_buffer, MAX_TEST_QUERY_LENGTH*2,

            statement_cursor->buffer, statement_cursor->length) == NULL);