database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

- Fix rpl_checksum test. Use basename of file in error messages, not the o

Browse Source 
nes prefixed with .\ or ./
- Add my_basename() to mysys.
- Do not compile files that are not needed on Windows (my_addr_resolve, an
d safemalloc related stuff it it is not used)
Avoids linker warnings about compilation of essentially empty files.
This commit is contained in:
Vladislav Vaintroub
2012-01-20 01:57:58 +01:00
parent 139bf5ce4c
commit 74cac79218
6 changed files with 61 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_repl.cc
View File

@@ -554,6 +554,7 @@ static int send_heartbeat_event(NET* net, String* packet,
DBUG_RETURN(0);
}
/*
TODO: Clean up loop to only have one call to send_file()
*/
@@ -1194,8 +1195,8 @@ err:
of the last position read.
*/
my_snprintf(error_text, sizeof(error_text), fmt, errmsg,
coord->file_name, (llstr(coord->pos, llbuff1), llbuff1),
log_file_name, (llstr(my_b_tell(&log), llbuff2), llbuff2));
my_basename(coord->file_name), (llstr(coord->pos, llbuff1), llbuff1),
my_basename(log_file_name), (llstr(my_b_tell(&log), llbuff2), llbuff2));
}
else
strcpy(error_text, errmsg);