mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0

Browse source 
into eagle.mysql.r18.ru:/home/vva/work/BUG_1073/mysql-4.0


client/mysqlbinlog.cc:
  Auto merged
This commit is contained in:
unknown 2003-09-19 12:34:56 -04:00
commit eac3b0682a
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
client/mysqlbinlog.cc
View file

@ -21,6 +21,7 @@
#include <assert.h> #include <assert.h>
#include "log_event.h" #include "log_event.h"
#include "include/my_sys.h" #include "include/my_sys.h"
#include "unistd.h"
#define BIN_LOG_HEADER_SIZE 4 #define BIN_LOG_HEADER_SIZE 4
#define PROBE_HEADER_LEN (EVENT_LEN_OFFSET+4) #define PROBE_HEADER_LEN (EVENT_LEN_OFFSET+4)
@ -81,9 +82,9 @@ class Load_log_processor
bname--; bname--;
uint blen= ce->fname_len - (bname-ce->fname); 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; 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)) set_dynamic(&file_names,(gptr)&ce,ce->file_id))
{ {
die("Could not construct local filename %s%s",target_dir_name,bname); die("Could not construct local filename %s%s",target_dir_name,bname);
@ -96,6 +97,21 @@ class Load_log_processor
memcpy(ptr,bname,blen); memcpy(ptr,bname,blen);
ptr+= blen; ptr+= blen;
sprintf(ptr,"-%08x",ce->file_id); 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); ce->set_fname_outside_temp_buf(tmp,full_len);