database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge mysql.com:/home/pz/mysql/mysql-4.1-root

Browse Source 
into mysql.com:/home/pz/mysql/mysql-4.1


sql/sql_yacc.yy:
  Auto merged
This commit is contained in:
unknown
2002-10-30 14:47:05 +03:00
parent 825567cbd7 e086000f19
commit 03437238ee
19 changed files with 448 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/Makefile.am
View File

@@ -30,7 +30,7 @@ dist-hook:
$(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(distdir)/t $(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(distdir)/t
$(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include $(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include
$(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r $(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r
$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(srcdir)/std_data/*.001 $(distdir)/std_data $(INSTALL_DATA) $(srcdir)/std_data/*.dat $(srcdir)/std_data/*.000001 $(distdir)/std_data
install-data-local: install-data-local:
$(mkinstalldirs) \ $(mkinstalldirs) \

8
mysql-test/r/rpl000015.result
View File

@@ -1,23 +1,23 @@
reset master; reset master;
show master status; show master status;
File Position Binlog_do_db Binlog_ignore_db File Position Binlog_do_db Binlog_ignore_db
master-bin.001 79 master-bin.000001 79
reset slave; reset slave;
show slave status; show slave status;
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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
change master to master_host='127.0.0.1'; change master to master_host='127.0.0.1';
show slave status; show slave status;
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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
127.0.0.1 test MASTER_PORT 7 4 slave-relay-bin.001 4 No No 0 0 0 4 127.0.0.1 test MASTER_PORT 7 4 slave-relay-bin.000001 4 No No 0 0 0 4
change master to master_host='127.0.0.1',master_user='root', change master to master_host='127.0.0.1',master_user='root',
master_password='',master_port=MASTER_PORT; master_password='',master_port=MASTER_PORT;
show slave status; show slave status;
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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
127.0.0.1 root MASTER_PORT 7 4 slave-relay-bin.001 4 No No 0 0 0 4 127.0.0.1 root MASTER_PORT 7 4 slave-relay-bin.000001 4 No No 0 0 0 4
start slave; start slave;
show slave status; show slave status;
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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
127.0.0.1 root MASTER_PORT 7 master-bin.001 79 slave-relay-bin.001 120 master-bin.001 Yes Yes 0 0 79 120 127.0.0.1 root MASTER_PORT 7 master-bin.000001 79 slave-relay-bin.000001 123 master-bin.000001 Yes Yes 0 0 79 123
drop table if exists t1; drop table if exists t1;
create table t1 (n int); create table t1 (n int);
insert into t1 values (10),(45),(90); insert into t1 values (10),(45),(90);

4
mysql-test/r/rpl000018.result
View File

@@ -2,8 +2,8 @@ reset slave;
start slave; start slave;
show binary logs; show binary logs;
Log_name Log_name
master-bin.001 master-bin.000001
master-bin.002 master-bin.000002
drop table if exists t1; drop table if exists t1;
create table t1(n int); create table t1(n int);
insert into t1 values (3351); insert into t1 values (3351);

2
mysql-test/r/rpl_flush_log_loop.result
View File

@@ -14,4 +14,4 @@ start slave;
flush logs; flush logs;
show slave status; show slave status;
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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
127.0.0.1 root SLAVE_PORT 60 slave-bin.001 79 relay-log.001 119 slave-bin.001 Yes Yes 0 0 79 119 127.0.0.1 root SLAVE_PORT 60 slave-bin.000001 79 relay-log.000001 122 slave-bin.000001 Yes Yes 0 0 79 122

96
mysql-test/r/rpl_log.result
View File

@@ -16,25 +16,25 @@ load data infile '../../std_data/words.dat' into table t1;
drop table t1; drop table t1;
show binlog events; show binlog events;
Log_name Pos Event_type Server_id Orig_log_pos Info Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3 master-bin.000001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3
master-bin.001 79 Query 1 79 use `test`; create table t1(n int not null auto_increment primary key) master-bin.000001 79 Query 1 79 use `test`; create table t1(n int not null auto_increment primary key)
master-bin.001 172 Intvar 1 172 INSERT_ID=1 master-bin.000001 172 Intvar 1 172 INSERT_ID=1
master-bin.001 200 Query 1 200 use `test`; insert into t1 values (NULL) master-bin.000001 200 Query 1 200 use `test`; insert into t1 values (NULL)
master-bin.001 263 Query 1 263 use `test`; drop table t1 master-bin.000001 263 Query 1 263 use `test`; drop table t1
master-bin.001 311 Query 1 311 use `test`; create table t1 (word char(20) not null) master-bin.000001 311 Query 1 311 use `test`; create table t1 (word char(20) not null)
master-bin.001 386 Create_file 1 386 db=test;table=t1;file_id=1;block_len=81 master-bin.000001 386 Create_file 1 386 db=test;table=t1;file_id=1;block_len=81
master-bin.001 556 Exec_load 1 556 ;file_id=1 master-bin.000001 556 Exec_load 1 556 ;file_id=1
master-bin.001 579 Query 1 579 use `test`; drop table t1 master-bin.000001 579 Query 1 579 use `test`; drop table t1
show binlog events from 79 limit 1; show binlog events from 79 limit 1;
Log_name Pos Event_type Server_id Orig_log_pos Info Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.001 79 Query 1 79 use `test`; create table t1(n int not null auto_increment primary key) master-bin.000001 79 Query 1 79 use `test`; create table t1(n int not null auto_increment primary key)
show binlog events from 79 limit 2; show binlog events from 79 limit 2;
Log_name Pos Event_type Server_id Orig_log_pos Info Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.001 79 Query 1 79 use `test`; create table t1(n int not null auto_increment primary key) master-bin.000001 79 Query 1 79 use `test`; create table t1(n int not null auto_increment primary key)
master-bin.001 172 Intvar 1 172 INSERT_ID=1 master-bin.000001 172 Intvar 1 172 INSERT_ID=1
show binlog events from 79 limit 2,1; show binlog events from 79 limit 2,1;
Log_name Pos Event_type Server_id Orig_log_pos Info Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.001 200 Query 1 200 use `test`; insert into t1 values (NULL) master-bin.000001 200 Query 1 200 use `test`; insert into t1 values (NULL)
flush logs; flush logs;
start slave; start slave;
flush logs; flush logs;
@@ -44,49 +44,49 @@ insert into t1 values (1);
drop table t1; drop table t1;
show binlog events; show binlog events;
Log_name Pos Event_type Server_id Orig_log_pos Info Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3 master-bin.000001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3
master-bin.001 79 Query 1 79 use `test`; create table t1(n int not null auto_increment primary key) master-bin.000001 79 Query 1 79 use `test`; create table t1(n int not null auto_increment primary key)
master-bin.001 172 Intvar 1 172 INSERT_ID=1 master-bin.000001 172 Intvar 1 172 INSERT_ID=1
master-bin.001 200 Query 1 200 use `test`; insert into t1 values (NULL) master-bin.000001 200 Query 1 200 use `test`; insert into t1 values (NULL)
master-bin.001 263 Query 1 263 use `test`; drop table t1 master-bin.000001 263 Query 1 263 use `test`; drop table t1
master-bin.001 311 Query 1 311 use `test`; create table t1 (word char(20) not null) master-bin.000001 311 Query 1 311 use `test`; create table t1 (word char(20) not null)
master-bin.001 386 Create_file 1 386 db=test;table=t1;file_id=1;block_len=81 master-bin.000001 386 Create_file 1 386 db=test;table=t1;file_id=1;block_len=81
master-bin.001 556 Exec_load 1 556 ;file_id=1 master-bin.000001 556 Exec_load 1 556 ;file_id=1
master-bin.001 579 Query 1 579 use `test`; drop table t1 master-bin.000001 579 Query 1 579 use `test`; drop table t1
master-bin.001 627 Rotate 1 627 master-bin.002;pos=4 master-bin.000001 627 Rotate 1 627 master-bin.000002;pos=4
show binlog events in 'master-bin.002'; show binlog events in 'master-bin.000002';
Log_name Pos Event_type Server_id Orig_log_pos Info Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.002 4 Query 1 4 use `test`; create table t1 (n int) master-bin.000002 4 Query 1 4 use `test`; create table t1 (n int)
master-bin.002 62 Query 1 62 use `test`; insert into t1 values (1) master-bin.000002 62 Query 1 62 use `test`; insert into t1 values (1)
master-bin.002 122 Query 1 122 use `test`; drop table t1 master-bin.000002 122 Query 1 122 use `test`; drop table t1
show binary logs; show binary logs;
Log_name Log_name
master-bin.001 master-bin.000001
master-bin.002 master-bin.000002
start slave; start slave;
show binary logs; show binary logs;
Log_name Log_name
slave-bin.001 slave-bin.000001
slave-bin.002 slave-bin.000002
show binlog events in 'slave-bin.001' 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.001 4 Start 2 4 Server ver: VERSION, Binlog ver: 3 slave-bin.000001 4 Start 2 4 Server ver: VERSION, Binlog ver: 3
slave-bin.001 79 Query 1 79 use `test`; create table t1(n int not null auto_increment primary key) slave-bin.000001 79 Query 1 79 use `test`; create table t1(n int not null auto_increment primary key)
slave-bin.001 172 Intvar 1 200 INSERT_ID=1 slave-bin.000001 172 Intvar 1 200 INSERT_ID=1
slave-bin.001 200 Query 1 200 use `test`; insert into t1 values (NULL) slave-bin.000001 200 Query 1 200 use `test`; insert into t1 values (NULL)
slave-bin.001 263 Query 1 263 use `test`; drop table t1 slave-bin.000001 263 Query 1 263 use `test`; drop table t1
slave-bin.001 311 Query 1 311 use `test`; create table t1 (word char(20) not null) slave-bin.000001 311 Query 1 311 use `test`; create table t1 (word char(20) not null)
slave-bin.001 386 Create_file 1 386 db=test;table=t1;file_id=1;block_len=81 slave-bin.000001 386 Create_file 1 386 db=test;table=t1;file_id=1;block_len=81
slave-bin.001 565 Exec_load 1 556 ;file_id=1 slave-bin.000001 565 Exec_load 1 556 ;file_id=1
slave-bin.001 588 Query 1 579 use `test`; drop table t1 slave-bin.000001 588 Query 1 579 use `test`; drop table t1
slave-bin.001 636 Rotate 2 636 slave-bin.002;pos=4 slave-bin.000001 636 Rotate 2 636 slave-bin.000002;pos=4
show binlog events in 'slave-bin.002' from 4; show binlog events in 'slave-bin.000002' 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.002 4 Query 1 4 use `test`; create table t1 (n int) slave-bin.000002 4 Query 1 4 use `test`; create table t1 (n int)
slave-bin.002 62 Query 1 62 use `test`; insert into t1 values (1) slave-bin.000002 62 Query 1 62 use `test`; insert into t1 values (1)
slave-bin.002 122 Query 1 122 use `test`; drop table t1 slave-bin.000002 122 Query 1 122 use `test`; drop table t1
show slave status; show slave status;
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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
127.0.0.1 root MASTER_PORT 1 master-bin.002 170 slave-relay-bin.002 957 master-bin.002 Yes Yes 0 0 170 961 127.0.0.1 root MASTER_PORT 1 master-bin.000002 170 slave-relay-bin.000002 969 master-bin.000002 Yes Yes 0 0 170 973
show binlog events in 'slave-bin.005' from 4; show binlog events in 'slave-bin.000005' from 4;
Error when executing command SHOW BINLOG EVENTS: Could not find target log Error when executing command SHOW BINLOG EVENTS: Could not find target log

12
mysql-test/r/rpl_log_pos.result
View File

@@ -6,28 +6,28 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
show master status; show master status;
File Position Binlog_do_db Binlog_ignore_db File Position Binlog_do_db Binlog_ignore_db
master-bin.001 79 master-bin.000001 79
show slave status; show slave status;
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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
127.0.0.1 root MASTER_PORT 1 master-bin.001 79 slave-relay-bin.002 120 master-bin.001 Yes Yes 0 0 79 124 127.0.0.1 root MASTER_PORT 1 master-bin.000001 79 slave-relay-bin.000002 123 master-bin.000001 Yes Yes 0 0 79 127
change master to master_log_pos=73; change master to master_log_pos=73;
stop slave; stop slave;
change master to master_log_pos=73; change master to master_log_pos=73;
show slave status; show slave status;
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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
127.0.0.1 root MASTER_PORT 1 master-bin.001 73 slave-relay-bin.001 4 master-bin.001 No No 0 0 73 4 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73 slave-relay-bin.000001 4 master-bin.000001 No No 0 0 73 4
start slave; start slave;
show slave status; show slave status;
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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
127.0.0.1 root MASTER_PORT 1 master-bin.001 73 slave-relay-bin.001 4 master-bin.001 No Yes 0 0 73 4 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73 slave-relay-bin.000001 4 master-bin.000001 No Yes 0 0 73 4
change master to master_log_pos=173; change master to master_log_pos=173;
start slave; start slave;
show slave status; show slave status;
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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
127.0.0.1 root MASTER_PORT 1 master-bin.001 173 slave-relay-bin.001 4 master-bin.001 No Yes 0 0 173 4 127.0.0.1 root MASTER_PORT 1 master-bin.000001 173 slave-relay-bin.000001 4 master-bin.000001 No Yes 0 0 173 4
show master status; show master status;
File Position Binlog_do_db Binlog_ignore_db File Position Binlog_do_db Binlog_ignore_db
master-bin.001 79 master-bin.000001 79
create table if not exists t1 (n int); create table if not exists t1 (n int);
drop table if exists t1; drop table if exists t1;
create table t1 (n int); create table t1 (n int);

26
mysql-test/r/rpl_rotate_logs.result
View File

@@ -15,7 +15,7 @@ create table t1 (s text);
insert into t1 values('Could not break slave'),('Tried hard'); insert into t1 values('Could not break slave'),('Tried hard');
show slave status; show slave status;
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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
127.0.0.1 root MASTER_PORT 60 master-bin.001 417 slave-relay-bin.001 458 master-bin.001 Yes Yes 0 0 417 458 127.0.0.1 root MASTER_PORT 60 master-bin.000001 417 slave-relay-bin.000001 461 master-bin.000001 Yes Yes 0 0 417 461
select * from t1; select * from t1;
s s
Could not break slave Could not break slave
@@ -27,9 +27,9 @@ insert into t2 values (34),(67),(123);
flush logs; flush logs;
show binary logs; show binary logs;
Log_name Log_name
master-bin.001 master-bin.000001
master-bin.002 master-bin.000002
master-bin.003 master-bin.000003
create table t3 select * from temp_table; create table t3 select * from temp_table;
select * from t3; select * from t3;
a a
@@ -40,14 +40,14 @@ set insert_id=1234;
insert into t2 values(NULL); insert into t2 values(NULL);
set global sql_slave_skip_counter=1; set global sql_slave_skip_counter=1;
start slave; start slave;
purge master logs to 'master-bin.003'; purge master logs to 'master-bin.000003';
show binary logs; show binary logs;
Log_name Log_name
master-bin.003 master-bin.000003
insert into t2 values (65); insert into t2 values (65);
show slave status; show slave status;
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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
127.0.0.1 root MASTER_PORT 60 master-bin.003 290 slave-relay-bin.001 1073 master-bin.003 Yes Yes 0 0 290 1073 127.0.0.1 root MASTER_PORT 60 master-bin.000003 290 slave-relay-bin.000001 1088 master-bin.000003 Yes Yes 0 0 290 1088
select * from t2; select * from t2;
m m
34 34
@@ -62,19 +62,19 @@ create table t3 (n int);
create table t4 select * from temp_table; create table t4 select * from temp_table;
show binary logs; show binary logs;
Log_name Log_name
master-bin.003 master-bin.000003
master-bin.004 master-bin.000004
master-bin.005 master-bin.000005
master-bin.006 master-bin.000006
show master status; show master status;
File Position Binlog_do_db Binlog_ignore_db File Position Binlog_do_db Binlog_ignore_db
master-bin.006 838 master-bin.000006 838
select * from t4; select * from t4;
a a
testing temporary tables part 2 testing temporary tables part 2
show slave status; show slave status;
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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
127.0.0.1 root MASTER_PORT 60 master-bin.006 838 slave-relay-bin.001 8034 master-bin.006 Yes Yes 0 0 838 8034 127.0.0.1 root MASTER_PORT 60 master-bin.000006 838 slave-relay-bin.000001 8067 master-bin.000006 Yes Yes 0 0 838 8067
lock tables t3 read; lock tables t3 read;
select count(*) from t3 where n >= 4; select count(*) from t3 where n >= 4;
count(*) count(*)

BIN
mysql-test/std_data/master-bin.000001 Normal file
View File

Binary file not shown.

2
mysql-test/t/rpl000017-slave.sh
View File

@@ -1,7 +1,7 @@
rm -f $MYSQL_TEST_DIR/var/log/*relay* rm -f $MYSQL_TEST_DIR/var/log/*relay*
rm -f $MYSQL_TEST_DIR/var/slave-data/relay-log.info rm -f $MYSQL_TEST_DIR/var/slave-data/relay-log.info
cat > $MYSQL_TEST_DIR/var/slave-data/master.info <<EOF cat > $MYSQL_TEST_DIR/var/slave-data/master.info <<EOF
master-bin.001 master-bin.000001
4 4
127.0.0.1 127.0.0.1
replicate replicate

18
mysql-test/t/rpl_log.test
View File

@@ -39,7 +39,7 @@ insert into t1 values (1);
drop table t1; drop table t1;
--replace_result $VERSION VERSION --replace_result $VERSION VERSION
show binlog events; show binlog events;
show binlog events in 'master-bin.002'; show binlog events in 'master-bin.000002';
show binary logs; show binary logs;
save_master_pos; save_master_pos;
connection slave; connection slave;
@@ -47,19 +47,19 @@ start slave;
sync_with_master; sync_with_master;
show binary logs; show binary logs;
--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT $VERSION VERSION --replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT $VERSION VERSION
show binlog events in 'slave-bin.001' from 4; show binlog events in 'slave-bin.000001' from 4;
--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT $VERSION VERSION --replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT $VERSION VERSION
show binlog events in 'slave-bin.002' from 4; show binlog events in 'slave-bin.000002' from 4;
--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT --replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
show slave status; show slave status;
# Need to recode the following # Need to recode the following
#show new master for slave with master_log_file='master-bin.001' and master_log_pos=4 and master_server_id=1; #show new master for slave with master_log_file='master-bin.000001' and master_log_pos=4 and master_server_id=1;
#show new master for slave with master_log_file='master-bin.001' and master_log_pos=79 and master_server_id=1; #show new master for slave with master_log_file='master-bin.000001' and master_log_pos=79 and master_server_id=1;
#show new master for slave with master_log_file='master-bin.001' and master_log_pos=311 and master_server_id=1; #show new master for slave with master_log_file='master-bin.000001' and master_log_pos=311 and master_server_id=1;
#show new master for slave with master_log_file='master-bin.002' and master_log_pos=4 and master_server_id=1; #show new master for slave with master_log_file='master-bin.000002' and master_log_pos=4 and master_server_id=1;
#show new master for slave with master_log_file='master-bin.002' and master_log_pos=122 and master_server_id=1; #show new master for slave with master_log_file='master-bin.000002' and master_log_pos=122 and master_server_id=1;
--error 1220 --error 1220
show binlog events in 'slave-bin.005' from 4; show binlog events in 'slave-bin.000005' from 4;

2
mysql-test/t/rpl_rotate_logs.test
View File

@@ -86,7 +86,7 @@ connection master;
#let slave catch up #let slave catch up
sync_slave_with_master; sync_slave_with_master;
connection master; connection master;
purge master logs to 'master-bin.003'; purge master logs to 'master-bin.000003';
show binary logs; show binary logs;
insert into t2 values (65); insert into t2 values (65);
sync_slave_with_master; sync_slave_with_master;

19
sql/log.cc
View File

@@ -45,16 +45,19 @@ static bool test_if_number(const char *str,
static int find_uniq_filename(char *name) static int find_uniq_filename(char *name)
{ {
long number; long number;
uint i,length; uint i;
char buff[FN_REFLEN]; char buff[FN_REFLEN];
struct st_my_dir *dir_info; struct st_my_dir *dir_info;
reg1 struct fileinfo *file_info; reg1 struct fileinfo *file_info;
ulong max_found=0; ulong max_found=0;
DBUG_ENTER("find_uniq_filename"); DBUG_ENTER("find_uniq_filename");
length=dirname_part(buff,name); uint length = dirname_part(buff,name);
char *start=name+length,*end=strend(start); char *start = name + length;
char *end = strend(start);
*end='.'; *end='.';
length= (uint) (end-start+1); length= (uint) (end-start+1);
@@ -75,7 +78,7 @@ static int find_uniq_filename(char *name)
my_dirend(dir_info); my_dirend(dir_info);
*end++='.'; *end++='.';
sprintf(end,"%03ld",max_found+1); sprintf(end,"%06ld",max_found+1);
DBUG_RETURN(0); DBUG_RETURN(0);
} }

1
sql/log_event.cc
View File

@@ -126,6 +126,7 @@ const char* Log_event::get_type_str()
case APPEND_BLOCK_EVENT: return "Append_block"; case APPEND_BLOCK_EVENT: return "Append_block";
case DELETE_FILE_EVENT: return "Delete_file"; case DELETE_FILE_EVENT: return "Delete_file";
case EXEC_LOAD_EVENT: return "Exec_load"; case EXEC_LOAD_EVENT: return "Exec_load";
case RAND_EVENT: return "RAND";
default: /* impossible */ return "Unknown"; default: /* impossible */ return "Unknown";
} }
} }

335
sql/slave.cc
View File

@@ -77,10 +77,14 @@ static int check_master_version(MYSQL* mysql, MASTER_INFO* mi);
char* rewrite_db(char* db); char* rewrite_db(char* db);
/* /*****************************************************************************
Get a bit mask for which threads are running so that we later can
restart these threads init_thread_mask()
*/
Get a bit mask for which threads are running so that we can later restart
these threads.
*****************************************************************************/
void init_thread_mask(int* mask,MASTER_INFO* mi,bool inverse) void init_thread_mask(int* mask,MASTER_INFO* mi,bool inverse)
{ {
@@ -95,7 +99,11 @@ void init_thread_mask(int* mask,MASTER_INFO* mi,bool inverse)
*mask = tmp_mask; *mask = tmp_mask;
} }
/*****************************************************************************
lock_slave_threads()
*****************************************************************************/
void lock_slave_threads(MASTER_INFO* mi) void lock_slave_threads(MASTER_INFO* mi)
{ {
//TODO: see if we can do this without dual mutex //TODO: see if we can do this without dual mutex
@@ -103,6 +111,11 @@ void lock_slave_threads(MASTER_INFO* mi)
pthread_mutex_lock(&mi->rli.run_lock); pthread_mutex_lock(&mi->rli.run_lock);
} }
/*****************************************************************************
unlock_slave_threads()
*****************************************************************************/
void unlock_slave_threads(MASTER_INFO* mi) void unlock_slave_threads(MASTER_INFO* mi)
{ {
//TODO: see if we can do this without dual mutex //TODO: see if we can do this without dual mutex
@@ -110,7 +123,11 @@ void unlock_slave_threads(MASTER_INFO* mi)
pthread_mutex_unlock(&mi->run_lock); pthread_mutex_unlock(&mi->run_lock);
} }
/*****************************************************************************
init_slave()
*****************************************************************************/
int init_slave() int init_slave()
{ {
DBUG_ENTER("init_slave"); DBUG_ENTER("init_slave");
@@ -153,12 +170,21 @@ int init_slave()
DBUG_RETURN(0); DBUG_RETURN(0);
} }
/*****************************************************************************
free_table_ent()
*****************************************************************************/
static void free_table_ent(TABLE_RULE_ENT* e) static void free_table_ent(TABLE_RULE_ENT* e)
{ {
my_free((gptr) e, MYF(0)); my_free((gptr) e, MYF(0));
} }
/*****************************************************************************
get_table_key()
*****************************************************************************/
static byte* get_table_key(TABLE_RULE_ENT* e, uint* len, static byte* get_table_key(TABLE_RULE_ENT* e, uint* len,
my_bool not_used __attribute__((unused))) my_bool not_used __attribute__((unused)))
{ {
@@ -166,8 +192,10 @@ static byte* get_table_key(TABLE_RULE_ENT* e, uint* len,
return (byte*)e->db; return (byte*)e->db;
} }
/*****************************************************************************
init_relay_log_pos()
/*
Open the given relay log Open the given relay log
SYNOPSIS SYNOPSIS
@@ -194,8 +222,8 @@ static byte* get_table_key(TABLE_RULE_ENT* e, uint* len,
RETURN VALUES RETURN VALUES
0 ok 0 ok
1 error. errmsg is set to point to the error message 1 error. errmsg is set to point to the error message
*/
*****************************************************************************/
int init_relay_log_pos(RELAY_LOG_INFO* rli,const char* log, int init_relay_log_pos(RELAY_LOG_INFO* rli,const char* log,
ulonglong pos, bool need_data_lock, ulonglong pos, bool need_data_lock,
const char** errmsg) const char** errmsg)
@@ -276,9 +304,13 @@ err:
DBUG_RETURN ((*errmsg) ? 1 : 0); DBUG_RETURN ((*errmsg) ? 1 : 0);
} }
/*****************************************************************************
/* called from get_options() in mysqld.cc on start-up */ init_slave_skip_errors()
called from get_options() in mysqld.cc on start-up
*****************************************************************************/
void init_slave_skip_errors(const char* arg) void init_slave_skip_errors(const char* arg)
{ {
const char *p; const char *p;
@@ -307,12 +339,13 @@ void init_slave_skip_errors(const char* arg)
} }
} }
/*****************************************************************************
/* purge_relay_logs()
We assume we have a run lock on rli and that both slave thread
are not running
*/
Assumes to have a run lock on rli and that no slave thread are running.
*****************************************************************************/
int purge_relay_logs(RELAY_LOG_INFO* rli, THD *thd, bool just_reset, int purge_relay_logs(RELAY_LOG_INFO* rli, THD *thd, bool just_reset,
const char** errmsg) const char** errmsg)
{ {
@@ -357,6 +390,11 @@ err:
} }
/*****************************************************************************
terminate_slave_threads()
*****************************************************************************/
int terminate_slave_threads(MASTER_INFO* mi,int thread_mask,bool skip_lock) int terminate_slave_threads(MASTER_INFO* mi,int thread_mask,bool skip_lock)
{ {
if (!mi->inited) if (!mi->inited)
@@ -397,7 +435,11 @@ int terminate_slave_threads(MASTER_INFO* mi,int thread_mask,bool skip_lock)
DBUG_RETURN(0); DBUG_RETURN(0);
} }
/*****************************************************************************
terminate_slave_thread()
*****************************************************************************/
int terminate_slave_thread(THD* thd, pthread_mutex_t* term_lock, int terminate_slave_thread(THD* thd, pthread_mutex_t* term_lock,
pthread_mutex_t *cond_lock, pthread_mutex_t *cond_lock,
pthread_cond_t* term_cond, pthread_cond_t* term_cond,
@@ -442,6 +484,11 @@ int terminate_slave_thread(THD* thd, pthread_mutex_t* term_lock,
} }
/*****************************************************************************
start_slave_thread()
*****************************************************************************/
int start_slave_thread(pthread_handler h_func, pthread_mutex_t *start_lock, int start_slave_thread(pthread_handler h_func, pthread_mutex_t *start_lock,
pthread_mutex_t *cond_lock, pthread_mutex_t *cond_lock,
pthread_cond_t *start_cond, pthread_cond_t *start_cond,
@@ -504,13 +551,15 @@ int start_slave_thread(pthread_handler h_func, pthread_mutex_t *start_lock,
DBUG_RETURN(0); DBUG_RETURN(0);
} }
/*****************************************************************************
start_slave_threads()
/*
SLAVE_FORCE_ALL is not implemented here on purpose since it does not make SLAVE_FORCE_ALL is not implemented here on purpose since it does not make
sense to do that for starting a slave - we always care if it actually sense to do that for starting a slave--we always care if it actually
started the threads that were not previously running started the threads that were not previously running
*/
*****************************************************************************/
int start_slave_threads(bool need_slave_mutex, bool wait_for_start, int start_slave_threads(bool need_slave_mutex, bool wait_for_start,
MASTER_INFO* mi, const char* master_info_fname, MASTER_INFO* mi, const char* master_info_fname,
const char* slave_info_fname, int thread_mask) const char* slave_info_fname, int thread_mask)
@@ -550,7 +599,11 @@ int start_slave_threads(bool need_slave_mutex, bool wait_for_start,
DBUG_RETURN(error); DBUG_RETURN(error);
} }
/*****************************************************************************
init_table_rule_hash()
*****************************************************************************/
void init_table_rule_hash(HASH* h, bool* h_inited) void init_table_rule_hash(HASH* h, bool* h_inited)
{ {
hash_init(h, system_charset_info,TABLE_RULE_HASH_SIZE,0,0, hash_init(h, system_charset_info,TABLE_RULE_HASH_SIZE,0,0,
@@ -559,6 +612,11 @@ void init_table_rule_hash(HASH* h, bool* h_inited)
*h_inited = 1; *h_inited = 1;
} }
/*****************************************************************************
init_table_rule_array()
*****************************************************************************/
void init_table_rule_array(DYNAMIC_ARRAY* a, bool* a_inited) void init_table_rule_array(DYNAMIC_ARRAY* a, bool* a_inited)
{ {
my_init_dynamic_array(a, sizeof(TABLE_RULE_ENT*), TABLE_RULE_ARR_SIZE, my_init_dynamic_array(a, sizeof(TABLE_RULE_ENT*), TABLE_RULE_ARR_SIZE,
@@ -566,6 +624,11 @@ void init_table_rule_array(DYNAMIC_ARRAY* a, bool* a_inited)
*a_inited = 1; *a_inited = 1;
} }
/*****************************************************************************
find_wild()
*****************************************************************************/
static TABLE_RULE_ENT* find_wild(DYNAMIC_ARRAY *a, const char* key, int len) static TABLE_RULE_ENT* find_wild(DYNAMIC_ARRAY *a, const char* key, int len)
{ {
uint i; uint i;
@@ -584,6 +647,11 @@ static TABLE_RULE_ENT* find_wild(DYNAMIC_ARRAY *a, const char* key, int len)
return 0; return 0;
} }
/*****************************************************************************
tables_ok()
*****************************************************************************/
int tables_ok(THD* thd, TABLE_LIST* tables) int tables_ok(THD* thd, TABLE_LIST* tables)
{ {
for (; tables; tables = tables->next) for (; tables; tables = tables->next)
@@ -620,7 +688,11 @@ int tables_ok(THD* thd, TABLE_LIST* tables)
return !do_table_inited && !wild_do_table_inited; return !do_table_inited && !wild_do_table_inited;
} }
/*****************************************************************************
add_table_rule()
*****************************************************************************/
int add_table_rule(HASH* h, const char* table_spec) int add_table_rule(HASH* h, const char* table_spec)
{ {
const char* dot = strchr(table_spec, '.'); const char* dot = strchr(table_spec, '.');
@@ -638,6 +710,11 @@ int add_table_rule(HASH* h, const char* table_spec)
return 0; return 0;
} }
/*****************************************************************************
add_wild_table_rule()
*****************************************************************************/
int add_wild_table_rule(DYNAMIC_ARRAY* a, const char* table_spec) int add_wild_table_rule(DYNAMIC_ARRAY* a, const char* table_spec)
{ {
const char* dot = strchr(table_spec, '.'); const char* dot = strchr(table_spec, '.');
@@ -654,6 +731,11 @@ int add_wild_table_rule(DYNAMIC_ARRAY* a, const char* table_spec)
return 0; return 0;
} }
/*****************************************************************************
free_string_array()
*****************************************************************************/
static void free_string_array(DYNAMIC_ARRAY *a) static void free_string_array(DYNAMIC_ARRAY *a)
{ {
uint i; uint i;
@@ -666,8 +748,12 @@ static void free_string_array(DYNAMIC_ARRAY *a)
delete_dynamic(a); delete_dynamic(a);
} }
#ifdef NOT_USED_YET /*****************************************************************************
end_slave_on_walk()
*****************************************************************************/
#ifdef NOT_USED_YET
static int end_slave_on_walk(MASTER_INFO* mi, gptr /*unused*/) static int end_slave_on_walk(MASTER_INFO* mi, gptr /*unused*/)
{ {
end_master_info(mi); end_master_info(mi);
@@ -675,6 +761,11 @@ static int end_slave_on_walk(MASTER_INFO* mi, gptr /*unused*/)
} }
#endif #endif
/*****************************************************************************
end_slave()
*****************************************************************************/
void end_slave() void end_slave()
{ {
/* /*
@@ -694,7 +785,11 @@ void end_slave()
free_string_array(&replicate_wild_ignore_table); free_string_array(&replicate_wild_ignore_table);
} }
/*****************************************************************************
io_slave_killed()
*****************************************************************************/
static bool io_slave_killed(THD* thd, MASTER_INFO* mi) static bool io_slave_killed(THD* thd, MASTER_INFO* mi)
{ {
DBUG_ASSERT(mi->io_thd == thd); DBUG_ASSERT(mi->io_thd == thd);
@@ -702,7 +797,11 @@ static bool io_slave_killed(THD* thd, MASTER_INFO* mi)
return mi->abort_slave || abort_loop || thd->killed; return mi->abort_slave || abort_loop || thd->killed;
} }
/*****************************************************************************
sql_slave_killed()
*****************************************************************************/
static bool sql_slave_killed(THD* thd, RELAY_LOG_INFO* rli) static bool sql_slave_killed(THD* thd, RELAY_LOG_INFO* rli)
{ {
DBUG_ASSERT(rli->sql_thd == thd); DBUG_ASSERT(rli->sql_thd == thd);
@@ -710,7 +809,11 @@ static bool sql_slave_killed(THD* thd, RELAY_LOG_INFO* rli)
return rli->abort_slave || abort_loop || thd->killed; return rli->abort_slave || abort_loop || thd->killed;
} }
/*****************************************************************************
slave_print_error()
*****************************************************************************/
void slave_print_error(RELAY_LOG_INFO* rli, int err_code, const char* msg, ...) void slave_print_error(RELAY_LOG_INFO* rli, int err_code, const char* msg, ...)
{ {
va_list args; va_list args;
@@ -722,10 +825,13 @@ void slave_print_error(RELAY_LOG_INFO* rli, int err_code, const char* msg, ...)
rli->last_slave_errno = err_code; rli->last_slave_errno = err_code;
} }
/* /*****************************************************************************
This is used to tell a 3.23 master to break send_file()
*/
skip_load_data_infile()
This is used to tell a 3.23 master to break send_file()
*****************************************************************************/
void skip_load_data_infile(NET *net) void skip_load_data_infile(NET *net)
{ {
(void)net_request_file(net, "/dev/null"); (void)net_request_file(net, "/dev/null");
@@ -733,14 +839,22 @@ void skip_load_data_infile(NET *net)
(void)net_write_command(net, 0, "", 0, "", 0); // Send ok (void)net_write_command(net, 0, "", 0, "", 0); // Send ok
} }
/*****************************************************************************
net_request_file()
*****************************************************************************/
bool net_request_file(NET* net, const char* fname) bool net_request_file(NET* net, const char* fname)
{ {
DBUG_ENTER("net_request_file"); DBUG_ENTER("net_request_file");
DBUG_RETURN(net_write_command(net, 251, fname, strlen(fname), "", 0)); DBUG_RETURN(net_write_command(net, 251, fname, strlen(fname), "", 0));
} }
/*****************************************************************************
rewrite_db()
*****************************************************************************/
char* rewrite_db(char* db) char* rewrite_db(char* db)
{ {
if (replicate_rewrite_db.is_empty() || !db) if (replicate_rewrite_db.is_empty() || !db)
@@ -756,7 +870,11 @@ char* rewrite_db(char* db)
return db; return db;
} }
/*****************************************************************************
db_ok()
*****************************************************************************/
int db_ok(const char* db, I_List<i_string> &do_list, int db_ok(const char* db, I_List<i_string> &do_list,
I_List<i_string> &ignore_list ) I_List<i_string> &ignore_list )
{ {
@@ -796,7 +914,11 @@ int db_ok(const char* db, I_List<i_string> &do_list,
} }
} }
/*****************************************************************************
init_strvar_from_file()
*****************************************************************************/
static int init_strvar_from_file(char *var, int max_size, IO_CACHE *f, static int init_strvar_from_file(char *var, int max_size, IO_CACHE *f,
const char *default_val) const char *default_val)
{ {
@@ -825,7 +947,11 @@ static int init_strvar_from_file(char *var, int max_size, IO_CACHE *f,
return 1; return 1;
} }
/*****************************************************************************
init_intvar_from_file()
*****************************************************************************/
static int init_intvar_from_file(int* var, IO_CACHE* f, int default_val) static int init_intvar_from_file(int* var, IO_CACHE* f, int default_val)
{ {
char buf[32]; char buf[32];
@@ -843,7 +969,11 @@ static int init_intvar_from_file(int* var, IO_CACHE* f, int default_val)
return 1; return 1;
} }
/*****************************************************************************
check_master_version()
*****************************************************************************/
static int check_master_version(MYSQL* mysql, MASTER_INFO* mi) static int check_master_version(MYSQL* mysql, MASTER_INFO* mi)
{ {
const char* errmsg= 0; const char* errmsg= 0;
@@ -869,7 +999,11 @@ static int check_master_version(MYSQL* mysql, MASTER_INFO* mi)
return 0; return 0;
} }
/*****************************************************************************
create_table_from_dump()
*****************************************************************************/
static int create_table_from_dump(THD* thd, NET* net, const char* db, static int create_table_from_dump(THD* thd, NET* net, const char* db,
const char* table_name) const char* table_name)
{ {
@@ -963,6 +1097,11 @@ err:
return error; return error;
} }
/*****************************************************************************
fetch_master_table()
*****************************************************************************/
int fetch_master_table(THD *thd, const char *db_name, const char *table_name, int fetch_master_table(THD *thd, const char *db_name, const char *table_name,
MASTER_INFO *mi, MYSQL *mysql) MASTER_INFO *mi, MYSQL *mysql)
{ {
@@ -1009,8 +1148,11 @@ int fetch_master_table(THD *thd, const char *db_name, const char *table_name,
send_error(thd, error, errmsg); send_error(thd, error, errmsg);
DBUG_RETURN(test(error)); // Return 1 on error DBUG_RETURN(test(error)); // Return 1 on error
} }
/*****************************************************************************
end_master_info()
*****************************************************************************/
void end_master_info(MASTER_INFO* mi) void end_master_info(MASTER_INFO* mi)
{ {
DBUG_ENTER("end_master_info"); DBUG_ENTER("end_master_info");
@@ -1029,7 +1171,11 @@ void end_master_info(MASTER_INFO* mi)
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
/*****************************************************************************
init_relay_log_info()
*****************************************************************************/
int init_relay_log_info(RELAY_LOG_INFO* rli, const char* info_fname) int init_relay_log_info(RELAY_LOG_INFO* rli, const char* info_fname)
{ {
char fname[FN_REFLEN+128]; char fname[FN_REFLEN+128];
@@ -1163,7 +1309,11 @@ err:
DBUG_RETURN(1); DBUG_RETURN(1);
} }
/*****************************************************************************
add_relay_log()
*****************************************************************************/
static inline int add_relay_log(RELAY_LOG_INFO* rli,LOG_INFO* linfo) static inline int add_relay_log(RELAY_LOG_INFO* rli,LOG_INFO* linfo)
{ {
MY_STAT s; MY_STAT s;
@@ -1182,7 +1332,11 @@ static inline int add_relay_log(RELAY_LOG_INFO* rli,LOG_INFO* linfo)
DBUG_RETURN(0); DBUG_RETURN(0);
} }
/*****************************************************************************
wait_for_relay_log_space()
*****************************************************************************/
static bool wait_for_relay_log_space(RELAY_LOG_INFO* rli) static bool wait_for_relay_log_space(RELAY_LOG_INFO* rli)
{ {
bool slave_killed=0; bool slave_killed=0;
@@ -1206,7 +1360,11 @@ static bool wait_for_relay_log_space(RELAY_LOG_INFO* rli)
DBUG_RETURN(slave_killed); DBUG_RETURN(slave_killed);
} }
/*****************************************************************************
count_relay_log_space()
*****************************************************************************/
static int count_relay_log_space(RELAY_LOG_INFO* rli) static int count_relay_log_space(RELAY_LOG_INFO* rli)
{ {
LOG_INFO linfo; LOG_INFO linfo;
@@ -1225,7 +1383,11 @@ static int count_relay_log_space(RELAY_LOG_INFO* rli)
DBUG_RETURN(0); DBUG_RETURN(0);
} }
/*****************************************************************************
init_master_info()
*****************************************************************************/
int init_master_info(MASTER_INFO* mi, const char* master_info_fname, int init_master_info(MASTER_INFO* mi, const char* master_info_fname,
const char* slave_info_fname, const char* slave_info_fname,
bool abort_if_no_master_info_file) bool abort_if_no_master_info_file)
@@ -1343,7 +1505,11 @@ err:
DBUG_RETURN(1); DBUG_RETURN(1);
} }
/*****************************************************************************
register_slave_on_master()
*****************************************************************************/
int register_slave_on_master(MYSQL* mysql) int register_slave_on_master(MYSQL* mysql)
{ {
String packet; String packet;
@@ -1385,6 +1551,11 @@ int register_slave_on_master(MYSQL* mysql)
return 0; return 0;
} }
/*****************************************************************************
show_master_info()
*****************************************************************************/
int show_master_info(THD* thd, MASTER_INFO* mi) int show_master_info(THD* thd, MASTER_INFO* mi)
{ {
// TODO: fix this for multi-master // TODO: fix this for multi-master
@@ -1452,7 +1623,11 @@ int show_master_info(THD* thd, MASTER_INFO* mi)
DBUG_RETURN(0); DBUG_RETURN(0);
} }
/*****************************************************************************
flush_master_info()
*****************************************************************************/
bool flush_master_info(MASTER_INFO* mi) bool flush_master_info(MASTER_INFO* mi)
{ {
IO_CACHE* file = &mi->file; IO_CACHE* file = &mi->file;
@@ -1470,7 +1645,11 @@ bool flush_master_info(MASTER_INFO* mi)
DBUG_RETURN(0); DBUG_RETURN(0);
} }
/*****************************************************************************
st_relay_log_info::wait_for_pos()
*****************************************************************************/
int st_relay_log_info::wait_for_pos(THD* thd, String* log_name, int st_relay_log_info::wait_for_pos(THD* thd, String* log_name,
ulonglong log_pos) ulonglong log_pos)
{ {
@@ -1491,7 +1670,7 @@ int st_relay_log_info::wait_for_pos(THD* thd, String* log_name,
mi->slave_running) mi->slave_running)
{ {
bool pos_reached; bool pos_reached;
int cmp_result= 0; int different_file= 0;
DBUG_ASSERT(*master_log_name || master_log_pos == 0); DBUG_ASSERT(*master_log_name || master_log_pos == 0);
if (*master_log_name) if (*master_log_name)
{ {
@@ -1503,11 +1682,11 @@ int st_relay_log_info::wait_for_pos(THD* thd, String* log_name,
mysqlbin.1000 mysqlbin.1000
*/ */
char *basename= master_log_name + dirname_length(master_log_name); char *basename= master_log_name + dirname_length(master_log_name);
cmp_result = strncmp(basename, log_name->ptr(), different_file = strncmp(basename, log_name->ptr(),
log_name->length()); log_name->length());
} }
pos_reached = ((!cmp_result && master_log_pos >= log_pos) || pos_reached = ((!different_file && master_log_pos >= log_pos) ||
cmp_result > 0); different_file > 0);
if (pos_reached || thd->killed) if (pos_reached || thd->killed)
break; break;
@@ -1528,7 +1707,11 @@ int st_relay_log_info::wait_for_pos(THD* thd, String* log_name,
-1 : event_count); -1 : event_count);
} }
/*****************************************************************************
init_slave_thread()
*****************************************************************************/
static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type) static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type)
{ {
DBUG_ENTER("init_slave_thread"); DBUG_ENTER("init_slave_thread");
@@ -1571,7 +1754,11 @@ static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type)
DBUG_RETURN(0); DBUG_RETURN(0);
} }
/*****************************************************************************
safe_sleep()
*****************************************************************************/
static int safe_sleep(THD* thd, int sec, CHECK_KILLED_FUNC thread_killed, static int safe_sleep(THD* thd, int sec, CHECK_KILLED_FUNC thread_killed,
void* thread_killed_arg) void* thread_killed_arg)
{ {
@@ -1600,7 +1787,11 @@ static int safe_sleep(THD* thd, int sec, CHECK_KILLED_FUNC thread_killed,
return 0; return 0;
} }
/*****************************************************************************
request_dump()
*****************************************************************************/
static int request_dump(MYSQL* mysql, MASTER_INFO* mi, static int request_dump(MYSQL* mysql, MASTER_INFO* mi,
bool *suppress_warnings) bool *suppress_warnings)
{ {
@@ -1635,7 +1826,11 @@ static int request_dump(MYSQL* mysql, MASTER_INFO* mi,
DBUG_RETURN(0); DBUG_RETURN(0);
} }
/*****************************************************************************
request_table_dump()
*****************************************************************************/
static int request_table_dump(MYSQL* mysql, const char* db, const char* table) static int request_table_dump(MYSQL* mysql, const char* db, const char* table)
{ {
char buf[1024]; char buf[1024];
@@ -1665,8 +1860,11 @@ command");
} }
/* /*****************************************************************************
read one event from the master
read_event()
Read one event from the master
SYNOPSIS SYNOPSIS
read_event() read_event()
@@ -1681,8 +1879,7 @@ command");
'packet_error' Error 'packet_error' Error
number Length of packet number Length of packet
*/ *****************************************************************************/
static ulong read_event(MYSQL* mysql, MASTER_INFO *mi, bool* suppress_warnings) static ulong read_event(MYSQL* mysql, MASTER_INFO *mi, bool* suppress_warnings)
{ {
ulong len; ulong len;
@@ -1731,7 +1928,11 @@ server_errno=%d)",
return len - 1; return len - 1;
} }
/*****************************************************************************
check_expected_error()
*****************************************************************************/
int check_expected_error(THD* thd, RELAY_LOG_INFO* rli, int expected_error) int check_expected_error(THD* thd, RELAY_LOG_INFO* rli, int expected_error)
{ {
switch (expected_error) { switch (expected_error) {
@@ -1753,7 +1954,11 @@ point. If you are sure that your master is ok, run this query manually on the\
} }
} }
/*****************************************************************************
exec_relay_log_event()
*****************************************************************************/
static int exec_relay_log_event(THD* thd, RELAY_LOG_INFO* rli) static int exec_relay_log_event(THD* thd, RELAY_LOG_INFO* rli)
{ {
DBUG_ASSERT(rli->sql_thd==thd); DBUG_ASSERT(rli->sql_thd==thd);
@@ -1818,8 +2023,11 @@ This may also be a network problem, or just a bug in the master or slave code.\
} }
} }
/*****************************************************************************
/* slave I/O thread */ Slave I/O Thread entry point
*****************************************************************************/
pthread_handler_decl(handle_slave_io,arg) pthread_handler_decl(handle_slave_io,arg)
{ {
THD *thd; // needs to be first for thread_stack THD *thd; // needs to be first for thread_stack
@@ -2088,9 +2296,11 @@ err:
DBUG_RETURN(0); // Can't return anything here DBUG_RETURN(0); // Can't return anything here
} }
/*****************************************************************************
/* slave SQL logic thread */ Slave SQL Thread entry point
*****************************************************************************/
pthread_handler_decl(handle_slave_sql,arg) pthread_handler_decl(handle_slave_sql,arg)
{ {
THD *thd; /* needs to be first for thread_stack */ THD *thd; /* needs to be first for thread_stack */
@@ -2226,6 +2436,11 @@ the slave SQL thread with \"SLAVE START\". We stopped at log \
DBUG_RETURN(0); // Can't return anything here DBUG_RETURN(0); // Can't return anything here
} }
/*****************************************************************************
process_io_create_file()
*****************************************************************************/
static int process_io_create_file(MASTER_INFO* mi, Create_file_log_event* cev) static int process_io_create_file(MASTER_INFO* mi, Create_file_log_event* cev)
{ {
int error = 1; int error = 1;
@@ -2320,7 +2535,10 @@ err:
DBUG_RETURN(error); DBUG_RETURN(error);
} }
/* /*****************************************************************************
process_io_rotate()
Start using a new binary log on the master Start using a new binary log on the master
SYNOPSIS SYNOPSIS
@@ -2338,8 +2556,8 @@ err:
RETURN VALUES RETURN VALUES
0 ok 0 ok
1 Log event is illegal 1 Log event is illegal
*/
*****************************************************************************/
static int process_io_rotate(MASTER_INFO *mi, Rotate_log_event *rev) static int process_io_rotate(MASTER_INFO *mi, Rotate_log_event *rev)
{ {
int return_val= 1; int return_val= 1;
@@ -2370,12 +2588,15 @@ static int process_io_rotate(MASTER_INFO *mi, Rotate_log_event *rev)
DBUG_RETURN(0); DBUG_RETURN(0);
} }
/* /*****************************************************************************
queue_old_event()
TODO: TODO:
Test this code before release - it has to be tested on a separate Test this code before release - it has to be tested on a separate
setup with 3.23 master setup with 3.23 master
*/
*****************************************************************************/
static int queue_old_event(MASTER_INFO *mi, const char *buf, static int queue_old_event(MASTER_INFO *mi, const char *buf,
ulong event_len) ulong event_len)
{ {
@@ -2463,11 +2684,14 @@ static int queue_old_event(MASTER_INFO *mi, const char *buf,
DBUG_RETURN(0); DBUG_RETURN(0);
} }
/* /*****************************************************************************
queue_event()
TODO: verify the issue with stop events, see if we need them at all TODO: verify the issue with stop events, see if we need them at all
in the relay log in the relay log
*/
*****************************************************************************/
int queue_event(MASTER_INFO* mi,const char* buf, ulong event_len) int queue_event(MASTER_INFO* mi,const char* buf, ulong event_len)
{ {
int error= 0; int error= 0;
@@ -2520,7 +2744,11 @@ int queue_event(MASTER_INFO* mi,const char* buf, ulong event_len)
DBUG_RETURN(error); DBUG_RETURN(error);
} }
/*****************************************************************************
end_relay_log_info()
*****************************************************************************/
void end_relay_log_info(RELAY_LOG_INFO* rli) void end_relay_log_info(RELAY_LOG_INFO* rli)
{ {
DBUG_ENTER("end_relay_log_info"); DBUG_ENTER("end_relay_log_info");
@@ -2545,18 +2773,26 @@ void end_relay_log_info(RELAY_LOG_INFO* rli)
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
/* try to connect until successful or slave killed */ /*****************************************************************************
safe_connect()
Try to connect until successful or slave killed
*****************************************************************************/
static int safe_connect(THD* thd, MYSQL* mysql, MASTER_INFO* mi) static int safe_connect(THD* thd, MYSQL* mysql, MASTER_INFO* mi)
{ {
return connect_to_master(thd, mysql, mi, 0, 0); return connect_to_master(thd, mysql, mi, 0, 0);
} }
/*****************************************************************************
connect_to_master()
/*
Try to connect until successful or slave killed or we have retried Try to connect until successful or slave killed or we have retried
master_retry_count times master_retry_count times
*/
*****************************************************************************/
static int connect_to_master(THD* thd, MYSQL* mysql, MASTER_INFO* mi, static int connect_to_master(THD* thd, MYSQL* mysql, MASTER_INFO* mi,
bool reconnect, bool suppress_warnings) bool reconnect, bool suppress_warnings)
{ {
@@ -2635,20 +2871,24 @@ replication resumed in log '%s' at position %s", mi->user,
DBUG_RETURN(slave_was_killed); DBUG_RETURN(slave_was_killed);
} }
/*****************************************************************************
safe_reconnect()
/*
Try to connect until successful or slave killed or we have retried Try to connect until successful or slave killed or we have retried
master_retry_count times master_retry_count times
*/
*****************************************************************************/
static int safe_reconnect(THD* thd, MYSQL* mysql, MASTER_INFO* mi, static int safe_reconnect(THD* thd, MYSQL* mysql, MASTER_INFO* mi,
bool suppress_warnings) bool suppress_warnings)
{ {
return connect_to_master(thd, mysql, mi, 1, suppress_warnings); return connect_to_master(thd, mysql, mi, 1, suppress_warnings);
} }
/*****************************************************************************
flush_relay_log_info()
/*
Store the file and position where the execute-slave thread are in the Store the file and position where the execute-slave thread are in the
relay log. relay log.
@@ -2675,8 +2915,8 @@ static int safe_reconnect(THD* thd, MYSQL* mysql, MASTER_INFO* mi,
RETURN VALUES RETURN VALUES
0 ok 0 ok
1 write error 1 write error
*/
*****************************************************************************/
bool flush_relay_log_info(RELAY_LOG_INFO* rli) bool flush_relay_log_info(RELAY_LOG_INFO* rli)
{ {
bool error=0; bool error=0;
@@ -2705,12 +2945,13 @@ bool flush_relay_log_info(RELAY_LOG_INFO* rli)
return error; return error;
} }
/*****************************************************************************
/* reopen_relay_log()
This function is called when we notice that the current "hot" log
got rotated under our feet.
*/
Called when we notice that the current "hot" log got rotated under our feet.
*****************************************************************************/
static IO_CACHE *reopen_relay_log(RELAY_LOG_INFO *rli, const char **errmsg) static IO_CACHE *reopen_relay_log(RELAY_LOG_INFO *rli, const char **errmsg)
{ {
DBUG_ASSERT(rli->cur_log != &rli->cache_buf); DBUG_ASSERT(rli->cur_log != &rli->cache_buf);
@@ -2725,7 +2966,11 @@ static IO_CACHE *reopen_relay_log(RELAY_LOG_INFO *rli, const char **errmsg)
DBUG_RETURN(cur_log); DBUG_RETURN(cur_log);
} }
/*****************************************************************************
next_event()
*****************************************************************************/
Log_event* next_event(RELAY_LOG_INFO* rli) Log_event* next_event(RELAY_LOG_INFO* rli)
{ {
Log_event* ev; Log_event* ev;

88
sql/slave.h
View File

@@ -7,22 +7,28 @@
#define MAX_SLAVE_ERRMSG 1024 #define MAX_SLAVE_ERRMSG 1024
#define MAX_SLAVE_ERROR 2000 #define MAX_SLAVE_ERROR 2000
/* /*****************************************************************************
The replication is accomplished by starting two threads - I/O
thread, and SQL thread. I/O thread is associated with its
MASTER_INFO struct, so MASTER_INFO can be viewed as I/O thread
descriptor. SQL thread is associated with RELAY_LOG_INFO struct.
I/O thread reads maintains a connection to the master, and reads log MySQL Replication
events from the master as they arrive, queueing them by writing them
out into the temporary slave binary log (relay log). The SQL thread,
in turn, reads the slave binary log executing each event.
Relay log is needed to be able to handle situations when there is a large Replication is implemented via two types of threads:
backlog of unprocessed events from the master (eg. one particular update
takes a day to finish), and to be able to restart the slave server without I/O Thread - One of these threads is started for each master server.
having to re-read the master updates. They maintain a connection to their master server, read log
*/ events from the master as they arrive, and queues them into
a single, shared relay log file. A MASTER_INFO struct
represents each of these threads.
SQL Thread - One of these threads is started and reads from the relay log
file, executing each event. A RELAY_LOG_INFO struct
represents this thread.
Buffering in the relay log file makes it unnecessary to reread events from
a master server across a slave restart. It also decouples the slave from
the master where long-running updates and event logging are concerned--ie
it can continue to log new events while a slow query executes on the slave.
*****************************************************************************/
extern ulong slave_net_timeout, master_retry_count; extern ulong slave_net_timeout, master_retry_count;
extern MY_BITMAP slave_error_mask; extern MY_BITMAP slave_error_mask;
@@ -48,11 +54,16 @@ struct st_master_info;
--active_mi_in_use; \ --active_mi_in_use; \
pthread_mutex_unlock(&LOCK_active_mi); } pthread_mutex_unlock(&LOCK_active_mi); }
/* /*****************************************************************************
st_relay_log_info contains information on the current relay log and
relay log offset, and master log name and log sequence corresponding to the Replication SQL Thread
last update. Additionally, misc information specific to the SQL thread is
included. st_relay_log_info contains:
- the current relay log
- the current relay log offset
- master log name
- master log sequence corresponding to the last update
- misc information specific to the SQL thread
st_relay_log_info is initialized from the slave.info file if such exists. st_relay_log_info is initialized from the slave.info file if such exists.
Otherwise, data members are intialized with defaults. The initialization is Otherwise, data members are intialized with defaults. The initialization is
@@ -66,7 +77,8 @@ struct st_master_info;
master_log_pos master_log_pos
To clean up, call end_relay_log_info() To clean up, call end_relay_log_info()
*/
*****************************************************************************/
typedef struct st_relay_log_info typedef struct st_relay_log_info
{ {
@@ -128,13 +140,18 @@ typedef struct st_relay_log_info
uint32 cur_log_old_open_count; uint32 cur_log_old_open_count;
/* /*
Current offset in the relay log. relay_log_pos - Current offset in the relay log.
pending - in some cases we do not increment offset immediately after pending - In some cases we do not increment offset immediately
processing an event, because the following event needs to be processed after processing an event, because the following event
atomically together with this one ( so far, there is only one type of needs to be processed atomically together with this one
such event - Intvar_event that sets auto_increment value). However, once such as:
both events have been processed, we need to increment by the cumulative
offset. pending stored the extra offset to be added to the position. Intvar_event - sets auto_increment value
Rand_event - sets the random seed
However, once both events have been processed, we need to
increment by the cumulative offset. 'pending' stores the
extra offset to be added to the position.
*/ */
ulonglong relay_log_pos, pending; ulonglong relay_log_pos, pending;
ulonglong log_space_limit,log_space_total; ulonglong log_space_limit,log_space_total;
@@ -230,10 +247,15 @@ typedef struct st_relay_log_info
Log_event* next_event(RELAY_LOG_INFO* rli); Log_event* next_event(RELAY_LOG_INFO* rli);
/* /*****************************************************************************
st_master_info contains information about how to connect to a master,
current master log name, and current log offset, as well as misc Replication IO Thread
control variables
st_master_info contains:
- information about how to connect to a master
- current master log name
- current master log offset
- misc control variables
st_master_info is initialized once from the master.info file if such st_master_info is initialized once from the master.info file if such
exists. Otherwise, data members corresponding to master.info fields exists. Otherwise, data members corresponding to master.info fields
@@ -255,9 +277,9 @@ Log_event* next_event(RELAY_LOG_INFO* rli);
flush_master_info() is required. flush_master_info() is required.
To clean up, call end_master_info() To clean up, call end_master_info()
*/
*****************************************************************************/
typedef struct st_master_info typedef struct st_master_info
{ {
char master_log_name[FN_REFLEN]; char master_log_name[FN_REFLEN];

1
sql/sql_class.cc
View File

@@ -108,6 +108,7 @@ THD::THD():user_time(0), fatal_error(0),
file_id = 0; file_id = 0;
cond_count=0; cond_count=0;
db_charset=default_charset_info; db_charset=default_charset_info;
thd_charset=default_charset_info;
mysys_var=0; mysys_var=0;
#ifndef DBUG_OFF #ifndef DBUG_OFF
dbug_sentry=THD_SENTRY_MAGIC; dbug_sentry=THD_SENTRY_MAGIC;

1
sql/sql_class.h
View File

@@ -481,6 +481,7 @@ public:
table_map used_tables; table_map used_tables;
USER_CONN *user_connect; USER_CONN *user_connect;
CHARSET_INFO *db_charset; CHARSET_INFO *db_charset;
CHARSET_INFO *thd_charset;
List <MYSQL_ERROR> warn_list; List <MYSQL_ERROR> warn_list;
uint warn_count[(uint) MYSQL_ERROR::WARN_LEVEL_END]; uint warn_count[(uint) MYSQL_ERROR::WARN_LEVEL_END];
uint total_warn_count, old_total_warn_count; uint total_warn_count, old_total_warn_count;

2
sql/sql_db.cc
View File

@@ -592,7 +592,7 @@ bool mysql_change_db(THD *thd, const char *name)
strmov(path+unpack_dirname(path,path), MY_DB_OPT_FILE); strmov(path+unpack_dirname(path,path), MY_DB_OPT_FILE);
load_db_opt(path, &create); load_db_opt(path, &create);
thd->db_charset=create.table_charset; thd->db_charset=create.table_charset;
thd->thd_charset=thd->db_charset ? thd->db_charset : default_charset_info;
DBUG_RETURN(0); DBUG_RETURN(0);
} }

4
sql/sql_yacc.yy
View File

@@ -3309,13 +3309,13 @@ opt_ignore_lines:
/* Common definitions */ /* Common definitions */
text_literal: text_literal:
TEXT_STRING { $$ = new Item_string($1.str,$1.length,default_charset_info); } TEXT_STRING { $$ = new Item_string($1.str,$1.length,current_thd->thd_charset); }
| UNDERSCORE_CHARSET TEXT_STRING { $$ = new Item_string($2.str,$2.length,Lex->charset); } | UNDERSCORE_CHARSET TEXT_STRING { $$ = new Item_string($2.str,$2.length,Lex->charset); }
| text_literal TEXT_STRING | text_literal TEXT_STRING
{ ((Item_string*) $1)->append($2.str,$2.length); }; { ((Item_string*) $1)->append($2.str,$2.length); };
text_string: text_string:
TEXT_STRING { $$= new String($1.str,$1.length,default_charset_info); } TEXT_STRING { $$= new String($1.str,$1.length,current_thd->thd_charset); }
| HEX_NUM | HEX_NUM
{ {
Item *tmp = new Item_varbinary($1.str,$1.length); Item *tmp = new Item_varbinary($1.str,$1.length);