Commit 3e25e586 authored by lars@mysql.com's avatar lars@mysql.com

Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1

parents 1bb2a929 60021dbe
...@@ -67,14 +67,14 @@ master-bin.000002 110 Query 1 110 use `test`; create table t1 (n int) ...@@ -67,14 +67,14 @@ master-bin.000002 110 Query 1 110 use `test`; create table t1 (n int)
master-bin.000002 168 Query 1 168 use `test`; insert into t1 values (1) master-bin.000002 168 Query 1 168 use `test`; insert into t1 values (1)
master-bin.000002 228 Query 1 228 use `test`; drop table t1 master-bin.000002 228 Query 1 228 use `test`; drop table t1
show binary logs; show binary logs;
Log_name Log_name File_size
master-bin.000001 master-bin.000001 0
master-bin.000002 master-bin.000002 276
start slave; start slave;
show binary logs; show binary logs;
Log_name Log_name File_size
slave-bin.000001 slave-bin.000001 0
slave-bin.000002 slave-bin.000002 170
show binlog events in 'slave-bin.000001' from 4; show binlog events in 'slave-bin.000001' from 4;
Log_name Pos Event_type Server_id Orig_log_pos Info Log_name Pos Event_type Server_id Orig_log_pos Info
slave-bin.000001 4 Start 2 4 Server ver: VERSION, Binlog ver: 3 slave-bin.000001 4 Start 2 4 Server ver: VERSION, Binlog ver: 3
......
...@@ -26,10 +26,10 @@ create table t2(m int not null auto_increment primary key); ...@@ -26,10 +26,10 @@ create table t2(m int not null auto_increment primary key);
insert into t2 values (34),(67),(123); insert into t2 values (34),(67),(123);
flush logs; flush logs;
show binary logs; show binary logs;
Log_name Log_name File_size
master-bin.000001 master-bin.000001 0
master-bin.000002 master-bin.000002 0
master-bin.000003 master-bin.000003 4
create table t3 select * from temp_table; create table t3 select * from temp_table;
select * from t3; select * from t3;
a a
...@@ -42,18 +42,18 @@ set global sql_slave_skip_counter=1; ...@@ -42,18 +42,18 @@ set global sql_slave_skip_counter=1;
start slave; start slave;
purge master logs to 'master-bin.000002'; purge master logs to 'master-bin.000002';
show master logs; show master logs;
Log_name Log_name File_size
master-bin.000002 master-bin.000002 0
master-bin.000003 master-bin.000003 229
purge binary logs to 'master-bin.000002'; purge binary logs to 'master-bin.000002';
show binary logs; show binary logs;
Log_name Log_name File_size
master-bin.000002 master-bin.000002 0
master-bin.000003 master-bin.000003 229
purge master logs before now(); purge master logs before now();
show binary logs; show binary logs;
Log_name Log_name File_size
master-bin.000003 master-bin.000003 229
insert into t2 values (65); insert into t2 values (65);
show slave status; show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
...@@ -73,9 +73,9 @@ count(*) ...@@ -73,9 +73,9 @@ count(*)
100 100
create table t4 select * from temp_table; create table t4 select * from temp_table;
show binary logs; show binary logs;
Log_name Log_name File_size
master-bin.000003 master-bin.000003 0
master-bin.000004 master-bin.000004 2886
show master status; show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000004 2886 master-bin.000004 2886
......
...@@ -1337,6 +1337,11 @@ int show_binlog_info(THD* thd) ...@@ -1337,6 +1337,11 @@ int show_binlog_info(THD* thd)
int show_binlogs(THD* thd) int show_binlogs(THD* thd)
{ {
IO_CACHE *index_file; IO_CACHE *index_file;
LOG_INFO cur;
IO_CACHE log;
File file;
const char *errmsg= 0;
MY_STAT stat_area;
char fname[FN_REFLEN]; char fname[FN_REFLEN];
List<Item> field_list; List<Item> field_list;
uint length; uint length;
...@@ -1351,20 +1356,42 @@ int show_binlogs(THD* thd) ...@@ -1351,20 +1356,42 @@ int show_binlogs(THD* thd)
} }
field_list.push_back(new Item_empty_string("Log_name", 255)); field_list.push_back(new Item_empty_string("Log_name", 255));
field_list.push_back(new Item_return_int("File_size", 20,
MYSQL_TYPE_LONGLONG));
if (protocol->send_fields(&field_list, 1)) if (protocol->send_fields(&field_list, 1))
DBUG_RETURN(1); DBUG_RETURN(1);
mysql_bin_log.lock_index(); mysql_bin_log.lock_index();
index_file=mysql_bin_log.get_index_file(); 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);
reinit_io_cache(index_file, READ_CACHE, (my_off_t) 0, 0, 0); reinit_io_cache(index_file, READ_CACHE, (my_off_t) 0, 0, 0);
/* The file ends with EOF or empty line */ /* The file ends with EOF or empty line */
while ((length=my_b_gets(index_file, fname, sizeof(fname))) > 1) while ((length=my_b_gets(index_file, fname, sizeof(fname))) > 1)
{ {
fname[--length] = '\0'; /* remove the newline */
protocol->prepare_for_resend(); protocol->prepare_for_resend();
int dir_len = dirname_length(fname); int dir_len = dirname_length(fname);
/* The -1 is for removing newline from fname */ protocol->store(fname + dir_len, length-dir_len, &my_charset_bin);
protocol->store(fname + dir_len, length-1-dir_len, &my_charset_bin); if(!(strncmp(fname+dir_len, cur.log_file_name+cur_dir_len, length-dir_len)))
{
/* 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)
{
protocol->store((ulonglong) my_b_filelength(&log));
end_io_cache(&log);
my_close(file, MYF(0));
} else {
/* the file wasn't openable, but 0 is an invalid value anyway */
protocol->store((ulonglong) 0);
}
}
if (protocol->write()) if (protocol->write())
goto err; goto err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment