diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-06-19 15:03:48 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-06-19 15:03:48 -0600 |
| commit | 5e2639830e1d5bad975204feeba94013551f337f (patch) | |
| tree | 109c8e44d015111333257be2ef3b9a11d2b6e0e7 /mysql-test | |
| parent | c498794d70d10a8219163d4b089b37ed5038d40a (diff) | |
| download | mariadb-git-5e2639830e1d5bad975204feeba94013551f337f.tar.gz | |
Added event sequence number and flags to binlog
Documented/cleaned up log event code
Updated tests
mysql-test/r/rpl000014.result:
new binlog format
mysql-test/r/rpl000015.result:
new binlog format
mysql-test/r/rpl000016.result:
new binlog format
mysql-test/std_data/master-bin.001:
new binlog format
mysql-test/t/rpl000014.test:
new binlog format
sql/log.cc:
new binlog format
sql/log_event.cc:
new binlog format
sql/log_event.h:
new binlog format
sql/sql_class.cc:
new binlog format
sql/sql_class.h:
new binlog format
sql/sql_repl.cc:
new binlog format
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl000014.result | 6 | ||||
| -rw-r--r-- | mysql-test/r/rpl000015.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/rpl000016.result | 8 | ||||
| -rw-r--r-- | mysql-test/std_data/master-bin.001 | bin | 113 -> 98 bytes | |||
| -rw-r--r-- | mysql-test/t/rpl000014.test | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/mysql-test/r/rpl000014.result b/mysql-test/r/rpl000014.result index a47c3c91c1d..b206fa99d10 100644 --- a/mysql-test/r/rpl000014.result +++ b/mysql-test/r/rpl000014.result @@ -1,7 +1,7 @@ File Position Binlog_do_db Binlog_ignore_db -master-bin.001 73 +master-bin.001 79 Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter -127.0.0.1 root 9999 1 master-bin.001 73 Yes 0 0 +127.0.0.1 root 9999 1 master-bin.001 79 Yes 0 0 Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter 127.0.0.1 root 9999 1 master-bin.001 73 No 0 0 Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter @@ -9,7 +9,7 @@ Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Rep Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter 127.0.0.1 root 9999 1 master-bin.001 173 Yes 0 0 File Position Binlog_do_db Binlog_ignore_db -master-bin.001 73 +master-bin.001 79 n 1 2 diff --git a/mysql-test/r/rpl000015.result b/mysql-test/r/rpl000015.result index 58487af27f8..12074224fd8 100644 --- a/mysql-test/r/rpl000015.result +++ b/mysql-test/r/rpl000015.result @@ -1,5 +1,5 @@ File Position Binlog_do_db Binlog_ignore_db -master-bin.001 73 +master-bin.001 79 Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter 0 0 0 No 0 0 Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter @@ -7,7 +7,7 @@ Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Rep Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter 127.0.0.1 root 9999 60 4 No 0 0 Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter -127.0.0.1 root 9999 60 master-bin.001 73 Yes 0 0 +127.0.0.1 root 9999 60 master-bin.001 79 Yes 0 0 n 10 45 diff --git a/mysql-test/r/rpl000016.result b/mysql-test/r/rpl000016.result index abe4275a124..16f8eceaf6d 100644 --- a/mysql-test/r/rpl000016.result +++ b/mysql-test/r/rpl000016.result @@ -1,5 +1,5 @@ Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter -127.0.0.1 root 9999 60 master-bin.001 216 Yes 0 0 +127.0.0.1 root 9999 60 master-bin.001 234 Yes 0 0 s Could not break slave Tried hard @@ -10,7 +10,7 @@ master-bin.003 Log_name master-bin.003 Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter -127.0.0.1 root 9999 60 master-bin.003 184 Yes 0 0 +127.0.0.1 root 9999 60 master-bin.003 202 Yes 0 0 m 34 65 @@ -23,8 +23,8 @@ master-bin.004 master-bin.005 master-bin.006 File Position Binlog_do_db Binlog_ignore_db -master-bin.006 131 +master-bin.006 720 Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter -127.0.0.1 root 9999 60 master-bin.006 131 Yes 0 0 +127.0.0.1 root 9999 60 master-bin.006 720 Yes 0 0 count(*) 100 diff --git a/mysql-test/std_data/master-bin.001 b/mysql-test/std_data/master-bin.001 Binary files differindex fa30d8e5302..2ec2397acdd 100644 --- a/mysql-test/std_data/master-bin.001 +++ b/mysql-test/std_data/master-bin.001 diff --git a/mysql-test/t/rpl000014.test b/mysql-test/t/rpl000014.test index b501d63b10e..604e614b3a8 100644 --- a/mysql-test/t/rpl000014.test +++ b/mysql-test/t/rpl000014.test @@ -25,7 +25,7 @@ create table foo (n int); insert into foo values (1),(2),(3); save_master_pos; connection slave; -change master to master_log_pos=73; +change master to master_log_pos=79; sync_with_master; select * from foo; connection master; |