diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-08-04 05:48:58 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-08-04 05:48:58 -0600 |
| commit | f442609077daf2bdfacd7590cd13d5faa42ee140 (patch) | |
| tree | df20b670229c5cc4c79a31f63dc4f74b32dc6ad9 /mysql-test/r/rpl_log.result | |
| parent | 7b1459305bdf8b8a40ef72047e191a2dbc629ee1 (diff) | |
| download | mariadb-git-f442609077daf2bdfacd7590cd13d5faa42ee140.tar.gz | |
new file_id generation method
mysql-test/r/rpl_log.result:
fixed result for new file_id generating method
BitKeeper/etc/ignore:
Added vio/viotest-ssl to the ignore list
sql/log.cc:
use a different method to generate unique file_id
sql/log_event.cc:
new file_id generationg method
sql/sql_class.h:
new file_id generationg method
Diffstat (limited to 'mysql-test/r/rpl_log.result')
| -rw-r--r-- | mysql-test/r/rpl_log.result | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result index f79bd8eccaa..ba5c2ca301d 100644 --- a/mysql-test/r/rpl_log.result +++ b/mysql-test/r/rpl_log.result @@ -5,8 +5,8 @@ master-bin.001 172 Intvar 1 3 INSERT_ID=1 master-bin.001 200 Query 1 4 use test; insert into t1 values (NULL) master-bin.001 263 Query 1 5 use test; drop table t1 master-bin.001 311 Query 1 6 use test; create table t1 (word char(20) not null) -master-bin.001 386 Create_file 1 7 db=test;table=t1;file_id=11;block_len=81 -master-bin.001 554 Exec_load 1 8 ;file_id=11 +master-bin.001 386 Create_file 1 7 db=test;table=t1;file_id=1;block_len=81 +master-bin.001 554 Exec_load 1 8 ;file_id=1 master-bin.001 577 Query 1 9 use test; drop table t1 Log_name Pos Event_type Server_id Log_seq Info master-bin.001 79 Query 1 2 use test; create table t1(n int not null auto_increment primary key) @@ -22,8 +22,8 @@ master-bin.001 172 Intvar 1 3 INSERT_ID=1 master-bin.001 200 Query 1 4 use test; insert into t1 values (NULL) master-bin.001 263 Query 1 5 use test; drop table t1 master-bin.001 311 Query 1 6 use test; create table t1 (word char(20) not null) -master-bin.001 386 Create_file 1 7 db=test;table=t1;file_id=11;block_len=81 -master-bin.001 554 Exec_load 1 8 ;file_id=11 +master-bin.001 386 Create_file 1 7 db=test;table=t1;file_id=1;block_len=81 +master-bin.001 554 Exec_load 1 8 ;file_id=1 master-bin.001 577 Query 1 9 use test; drop table t1 master-bin.001 625 Rotate 1 10 master-bin.002;pos=4 master-bin.001 666 Stop 1 11 @@ -46,11 +46,11 @@ slave-bin.001 225 Intvar 1 3 INSERT_ID=1 slave-bin.001 253 Query 1 4 use test; insert into t1 values (NULL) slave-bin.001 316 Query 1 5 use test; drop table t1 slave-bin.001 364 Query 1 6 use test; create table t1 (word char(20) not null) -slave-bin.001 439 Create_file 1 7 db=test;table=t1;file_id=11;block_len=81 -slave-bin.001 647 Exec_load 1 8 ;file_id=11 -slave-bin.001 670 Query 1 9 use test; drop table t1 -slave-bin.001 718 Rotate 1 4 slave-bin.002;pos=4; forced by master -slave-bin.001 758 Stop 2 5 +slave-bin.001 439 Create_file 1 7 db=test;table=t1;file_id=1;block_len=81 +slave-bin.001 646 Exec_load 1 8 ;file_id=1 +slave-bin.001 669 Query 1 9 use test; drop table t1 +slave-bin.001 717 Rotate 1 4 slave-bin.002;pos=4; forced by master +slave-bin.001 757 Stop 2 5 Log_name Pos Event_type Server_id Log_seq Info slave-bin.002 4 Start 2 1 Server ver: $VERSION, Binlog ver: 2 slave-bin.002 79 Slave 2 10 host=127.0.0.1,port=$MASTER_MYPORT,log=master-bin.002,pos=4 |