database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

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

Browse Source 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
This commit is contained in:
msvensson@shellback.(none)
2006-08-21 14:09:38 +02:00
parent c8d1c498fb 2b2985e0ea
commit adaa3a2a60
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/mysqltest.c
View File

@ -4957,9 +4957,6 @@ int main(int argc, char **argv)
die("No queries executed but result file found!"); die("No queries executed but result file found!");
} }
dynstr_free(&ds_res);
if (!got_end_timer) if (!got_end_timer)
timer_output(); /* No end_timer cmd, end it */ timer_output(); /* No end_timer cmd, end it */
free_used_memory(); free_used_memory();

2
tests/mysql_client_test.c
View File

@ -14975,6 +14975,8 @@ static void test_bug17667()
DIE("Read error"); DIE("Read error");
} }
} }
/* Print the line */
printf("%s", line_buffer);
} while (my_memmem(line_buffer, MAX_TEST_QUERY_LENGTH*2, } while (my_memmem(line_buffer, MAX_TEST_QUERY_LENGTH*2,
statement_cursor->buffer, statement_cursor->length) == NULL); statement_cursor->buffer, statement_cursor->length) == NULL);