Commit 3f6e20a0 authored by mleich@five.local.lan's avatar mleich@five.local.lan

Merge five.local.lan:/work/merge/mysql-5.0-funcs_1

into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
parents 30091e23 c6f63bc5
...@@ -733,7 +733,7 @@ sub record_log_pos { ...@@ -733,7 +733,7 @@ sub record_log_pos {
= @{$row_hash}{ qw / Master_Host Log_File Pos / }; = @{$row_hash}{ qw / Master_Host Log_File Pos / };
} else { } else {
($master_host, $log_file, $log_pos ) ($master_host, $log_file, $log_pos )
= @{$row_hash}{ qw / Master_Host Master_Log_File Read_Master_Log_Pos / }; = @{$row_hash}{ qw / Master_Host Relay_Master_Log_File Exec_Master_Log_Pos / };
} }
my $hostname = hostname(); my $hostname = hostname();
...@@ -836,9 +836,10 @@ log-pos-table from the values returned from "show master status" and ...@@ -836,9 +836,10 @@ log-pos-table from the values returned from "show master status" and
log_file and log_pos columns, and establish the position in the binary log_file and log_pos columns, and establish the position in the binary
logs that any slaves of this host should adopt if initialised from logs that any slaves of this host should adopt if initialised from
this dump. The slave status values are stored in master_host, this dump. The slave status values are stored in master_host,
master_log_file, and master_log_pos, and these are useful if the host master_log_file, and master_log_pos, corresponding to the coordinates
performing the dump is a slave and other sibling slaves are to be of the next to the last event the slave has executed. The slave or its
initialised from this dump. siblings can connect to the master next time and request replication
starting from the recorded values.
The name of the log-pos table should be supplied in database.table format. The name of the log-pos table should be supplied in database.table format.
A sample log-pos table definition: A sample log-pos table definition:
......
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