Commit 69aa271d authored by unknown's avatar unknown
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
parents 07fc9729 5e042add

mysql-test/r/alter_table.result

+26 −0
Original line number Diff line number Diff line
@@ -621,3 +621,29 @@ create table t1 (t varchar(255) default null, key t (t(80))) 
engine=myisam default charset=latin1;

alter table t1 change t t text;

drop table t1;

CREATE TABLE t1 (s CHAR(8) BINARY);

INSERT INTO t1 VALUES ('test');

SELECT LENGTH(s) FROM t1;

LENGTH(s)

4

ALTER TABLE t1 MODIFY s CHAR(10) BINARY;

SELECT LENGTH(s) FROM t1;

LENGTH(s)

4

DROP TABLE t1;

CREATE TABLE t1 (s BINARY(8));

INSERT INTO t1 VALUES ('test');

SELECT LENGTH(s) FROM t1;

LENGTH(s)

8

SELECT HEX(s) FROM t1;

HEX(s)

7465737400000000

ALTER TABLE t1 MODIFY s BINARY(10);

SELECT HEX(s) FROM t1;

HEX(s)

74657374000000000000

SELECT LENGTH(s) FROM t1;

LENGTH(s)

10

DROP TABLE t1;

mysql-test/r/binlog_row_drop_tmp_tbl.result

+0 −2
Original line number Diff line number Diff line
@@ -14,7 +14,5 @@ get_lock("a",10) 
show binlog events;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4

master-bin.000001	#	Table_map	1	#	table_id: # (mysql.proc)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	create database `drop-temp+table-test`

drop database `drop-temp+table-test`;

mysql-test/r/rpl_ps.result

+2 −0
Original line number Diff line number Diff line
@@ -26,3 +26,5 @@ from-master-2-'', 
from-var-from-master-3

drop table t1;

stop slave;

reset master;

reset slave;

mysql-test/r/rpl_row_log.result

+3 −7
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ master-bin.000001 # Rotate 1 # master-bin.000002;pos=4 
show binlog events in 'master-bin.000002';

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000002	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4

master-bin.000002	#	Table_map	1	#	table_id: # (mysql.slow_log)

master-bin.000002	#	Table_map	1	#	table_id: # (mysql.general_log)

master-bin.000002	#	Query	1	#	use `test`; create table t3 (a int)ENGINE=MyISAM

master-bin.000002	#	Query	1	#	use `test`; create table t2 (n int)ENGINE=MyISAM

master-bin.000002	#	Table_map	1	#	table_id: # (test.t2)
@@ -66,12 +64,12 @@ master-bin.000002 # Write_rows 1 # table_id: # flags: STMT_END_F 
show binary logs;

Log_name	File_size

master-bin.000001	1256

master-bin.000002	483

master-bin.000002	373

start slave;

show binary logs;

Log_name	File_size

slave-bin.000001	1354

slave-bin.000002	384

slave-bin.000002	274

show binlog events in 'slave-bin.000001' from 4;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
@@ -87,14 +85,12 @@ slave-bin.000001 # Rotate 2 # slave-bin.000002;pos=4 
show binlog events in 'slave-bin.000002' from 4;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

slave-bin.000002	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4

slave-bin.000002	#	Table_map	2	#	table_id: # (mysql.slow_log)

slave-bin.000002	#	Table_map	2	#	table_id: # (mysql.general_log)

slave-bin.000002	#	Query	1	#	use `test`; create table t2 (n int)ENGINE=MyISAM

slave-bin.000002	#	Table_map	1	#	table_id: # (test.t2)

slave-bin.000002	#	Write_rows	1	#	table_id: # flags: STMT_END_F

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

#	127.0.0.1	root	MASTER_PORT	1	master-bin.000002	483	#	#	master-bin.000002	Yes	Yes				#			0		0	483	#	None		0	No						#

#	127.0.0.1	root	MASTER_PORT	1	master-bin.000002	373	#	#	master-bin.000002	Yes	Yes				#			0		0	373	#	None		0	No						#

show binlog events in 'slave-bin.000005' from 4;

ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log

DROP TABLE t1;

mysql-test/r/rpl_row_log_innodb.result

+3 −7
Original line number Diff line number Diff line
@@ -61,8 +61,6 @@ master-bin.000001 # Rotate 1 # master-bin.000002;pos=4 
show binlog events in 'master-bin.000002';

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000002	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4

master-bin.000002	#	Table_map	1	#	table_id: # (mysql.slow_log)

master-bin.000002	#	Table_map	1	#	table_id: # (mysql.general_log)

master-bin.000002	#	Query	1	#	use `test`; create table t3 (a int)ENGINE=InnoDB

master-bin.000002	#	Query	1	#	use `test`; create table t2 (n int)ENGINE=InnoDB

master-bin.000002	#	Table_map	1	#	table_id: # (test.t2)
@@ -71,12 +69,12 @@ master-bin.000002 # Xid 1 # COMMIT /* XID */ 
show binary logs;

Log_name	File_size

master-bin.000001	1310

master-bin.000002	510

master-bin.000002	400

start slave;

show binary logs;

Log_name	File_size

slave-bin.000001	1408

slave-bin.000002	411

slave-bin.000002	301

show binlog events in 'slave-bin.000001' from 4;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
@@ -94,15 +92,13 @@ slave-bin.000001 # Rotate 2 # slave-bin.000002;pos=4 
show binlog events in 'slave-bin.000002' from 4;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

slave-bin.000002	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4

slave-bin.000002	#	Table_map	2	#	table_id: # (mysql.slow_log)

slave-bin.000002	#	Table_map	2	#	table_id: # (mysql.general_log)

slave-bin.000002	#	Query	1	#	use `test`; create table t2 (n int)ENGINE=InnoDB

slave-bin.000002	#	Table_map	1	#	table_id: # (test.t2)

slave-bin.000002	#	Write_rows	1	#	table_id: # flags: STMT_END_F

slave-bin.000002	#	Xid	1	#	COMMIT /* XID */

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

#	127.0.0.1	root	MASTER_PORT	1	master-bin.000002	510	#	#	master-bin.000002	Yes	Yes				#			0		0	510	#	None		0	No						#

#	127.0.0.1	root	MASTER_PORT	1	master-bin.000002	400	#	#	master-bin.000002	Yes	Yes				#			0		0	400	#	None		0	No						#

show binlog events in 'slave-bin.000005' from 4;

ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log

DROP TABLE t1;