database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Cleanup during code review

Browse Source 
Faster detection of wrong table names (like PRN) on windows
This commit is contained in:
monty@mysql.com
2005-05-25 12:56:47 +03:00
parent 93565c8e7d
commit fb90aaa7b5
7 changed files with 132 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
sql/sql_repl.cc
View File

@ -152,7 +152,8 @@ File open_binlog(IO_CACHE *log, const char *log_file_name,
File file;
DBUG_ENTER("open_binlog");
if ((file = my_open(log_file_name, O_RDONLY | O_BINARY, MYF(MY_WME))) < 0)
if ((file = my_open(log_file_name, O_RDONLY | O_BINARY | O_SHARE,
MYF(MY_WME))) < 0)
{
sql_print_error("Failed to open log (\
file '%s', errno %d)", log_file_name, my_errno);
@ -1338,13 +1339,11 @@ int show_binlogs(THD* thd)
{
IO_CACHE *index_file;
LOG_INFO cur;
IO_CACHE log;
File file;
const char *errmsg= 0;
MY_STAT stat_area;
char fname[FN_REFLEN];
List<Item> field_list;
uint length;
int cur_dir_len;
Protocol *protocol= thd->protocol;
DBUG_ENTER("show_binlogs");
@ -1364,34 +1363,35 @@ int show_binlogs(THD* thd)
index_file=mysql_bin_log.get_index_file();
mysql_bin_log.get_current_log(&cur);
int cur_dir_len = dirname_length(cur.log_file_name);
cur_dir_len= dirname_length(cur.log_file_name);
reinit_io_cache(index_file, READ_CACHE, (my_off_t) 0, 0, 0);
/* The file ends with EOF or empty line */
while ((length=my_b_gets(index_file, fname, sizeof(fname))) > 1)
{
fname[--length] = '\0'; /* remove the newline */
int dir_len;
ulonglong file_length= 0; // Length if open fails
fname[--length] = '\0'; // remove the newline
protocol->prepare_for_resend();
int dir_len = dirname_length(fname);
protocol->store(fname + dir_len, length-dir_len, &my_charset_bin);
if(!(strncmp(fname+dir_len, cur.log_file_name+cur_dir_len, length-dir_len)))
dir_len= dirname_length(fname);
length-= dir_len;
protocol->store(fname + dir_len, length, &my_charset_bin);
if (!(strncmp(fname+dir_len, cur.log_file_name+cur_dir_len, length)))
file_length= cur.pos; /* The active log, use the active position */
else
{
/* this is the active log, use the active position */
protocol->store((ulonglong) cur.pos);
} else {
/* this is an old log, open it and find the size */
if ((file=open_binlog(&log, fname+dir_len, &errmsg)) >= 0)
if ((file= my_open(fname+dir_len, O_RDONLY | O_SHARE | O_BINARY,
MYF(0))) >= 0)
{
protocol->store((ulonglong) my_b_filelength(&log));
end_io_cache(&log);
file_length= (ulonglong) my_seek(file, 0L, MY_SEEK_END, MYF(0));
my_close(file, MYF(0));
} else {
/* the file wasn't openable, but 0 is an invalid value anyway */
protocol->store((ulonglong) 0);
}
}
protocol->store(file_length);
if (protocol->write())
goto err;
}