diff options
| author | unknown <msvensson@shellback.(none)> | 2006-10-12 10:49:59 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-10-12 10:49:59 +0200 |
| commit | 1f837a5c76b89ea99b4064494243bd438e5af552 (patch) | |
| tree | a20a2f3af87df314a1c2be2e2443092fec4a651a /client | |
| parent | 6cbc74a70678ff9c11c140559b4cbc62bda3649e (diff) | |
| download | mariadb-git-1f837a5c76b89ea99b4064494243bd438e5af552.tar.gz | |
Only print cur_file->filename if cur_file->file is set
MOve DBUG_ASSERT(result_file_name) to after DBUG_ENTER
Change type of "reconnect" variable from int to my_bool, reconnect didn't work on Solaris without that
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; } |