diff options
| author | unknown <msvensson@shellback.(none)> | 2006-10-12 11:30:07 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-10-12 11:30:07 +0200 |
| commit | 4d45abc5d2d19abf6a79f585c997381c9346e6af (patch) | |
| tree | 9c61dfec1f4b3f6ab8ce4e33839842043ee2e779 /client | |
| parent | e5c2eda470c81d1d011d082a6d83dca7ed3eb8cc (diff) | |
| parent | 00f420db13751bfe36a1d382e44541896134e5cb (diff) | |
| download | mariadb-git-4d45abc5d2d19abf6a79f585c997381c9346e6af.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
sql-common/client.c:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index b671147e1d7..db15c6c43dd 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -668,9 +668,11 @@ void close_files() DBUG_ENTER("close_files"); for (; cur_file >= file_stack; cur_file--) { - DBUG_PRINT("info", ("file_name: %s", cur_file->file_name)); if (cur_file->file && cur_file->file != stdin) + { + DBUG_PRINT("info", ("closing file: %s", cur_file->file_name)); my_fclose(cur_file->file, MYF(0)); + } my_free((gptr)cur_file->file_name, MYF(MY_ALLOW_ZERO_PTR)); cur_file->file_name= 0; } @@ -950,8 +952,8 @@ err: void check_result(DYNAMIC_STRING* ds) { - DBUG_ASSERT(result_file_name); DBUG_ENTER("check_result"); + DBUG_ASSERT(result_file_name); switch (dyn_string_cmp(ds, result_file_name)) { @@ -2707,12 +2709,15 @@ char *get_string(char **to_ptr, char **from_ptr, void set_reconnect(MYSQL* mysql, int val) { + DBUG_ENTER("set_reconnect"); + DBUG_PRINT("info", ("val: %d", val)); #if MYSQL_VERSION_ID < 50000 mysql->reconnect= val; #else - int reconnect= val; + my_bool reconnect= val; mysql_options(mysql, MYSQL_OPT_RECONNECT, (char *)&reconnect); #endif + DBUG_VOID_RETURN; } |