diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 6 | ||||
| -rw-r--r-- | client/mysqlbinlog.cc | 20 |
2 files changed, 22 insertions, 4 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 639e5f450ad..2fa131b854a 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -40,7 +40,7 @@ #include <signal.h> #include <violite.h> -const char *VER= "12.21"; +const char *VER= "12.22"; /* Don't try to make a nice table if the data is too big */ #define MAX_COLUMN_LENGTH 1024 @@ -801,7 +801,9 @@ static int read_lines(bool execute_commands) char *prompt= (char*) (glob_buffer.is_empty() ? construct_prompt() : !in_string ? " -> " : in_string == '\'' ? - " '> " : " \"> "); + " '> " : (in_string == '`' ? + " `> " : + " \"> ")); if (opt_outfile && glob_buffer.is_empty()) fflush(OUTFILE); diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index e00c60ef0a5..43872dd718a 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -21,6 +21,7 @@ #include <assert.h> #include "log_event.h" #include "include/my_sys.h" +#include "unistd.h" #define BIN_LOG_HEADER_SIZE 4 #define PROBE_HEADER_LEN (EVENT_LEN_OFFSET+4) @@ -81,9 +82,9 @@ class Load_log_processor bname--; uint blen= ce->fname_len - (bname-ce->fname); - uint full_len= target_dir_name_len + blen; + uint full_len= target_dir_name_len + blen + 9 + 9 + 1; char *tmp; - if (!(tmp= my_malloc(full_len + 9 + 1,MYF(MY_WME))) || + if (!(tmp= my_malloc(full_len,MYF(MY_WME))) || set_dynamic(&file_names,(gptr)&ce,ce->file_id)) { die("Could not construct local filename %s%s",target_dir_name,bname); @@ -96,6 +97,21 @@ class Load_log_processor memcpy(ptr,bname,blen); ptr+= blen; sprintf(ptr,"-%08x",ce->file_id); + ptr+= 9; + + uint version= 0; + for (;;) + { + sprintf(ptr,"-%08x",version); + if (access(tmp,F_OK)) + break; + version++; + if (version>UINT_MAX) + { + die("Could not construct local filename %s%s",target_dir_name,bname); + return 0; + } + } ce->set_fname_outside_temp_buf(tmp,full_len); |