Commit 772ff3d4 authored by sven@riska.(none)'s avatar sven@riska.(none)
Browse files

Merge riska.(none):/home/sven/bktip/5.1-new-rpl 

into  riska.(none):/home/sven/bk/b32434-version_replication/5.1-new-rpl
parents dd913eaa 31355747

client/mysqlbinlog.cc

+2 −2
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ class Load_log_processor 
  File prepare_new_file_for_old_format(Load_log_event *le, char *filename);

  int load_old_format_file(NET* net, const char *server_fname,

			   uint server_fname_len, File file);

  int process_first_event(const char *bname, uint blen, const char *block,

  int process_first_event(const char *bname, uint blen, const uchar *block,

                          uint block_len, uint file_id,

                          Create_file_log_event *ce);

};
@@ -375,7 +375,7 @@ int Load_log_processor::load_old_format_file(NET* net, const char*server_fname, 
*/



int Load_log_processor::process_first_event(const char *bname, uint blen,

                                            const char *block, uint block_len,

                                            const uchar *block, uint block_len,

                                            uint file_id,

                                            Create_file_log_event *ce)

{

include/my_sys.h

+5 −0
Original line number Diff line number Diff line
@@ -521,6 +521,11 @@ typedef int (*qsort2_cmp)(const void *, const void *, const void *); 
#define my_b_tell(info) ((info)->pos_in_file + \

			 (size_t) (*(info)->current_pos - (info)->request_pos))



#define my_b_get_buffer_start(info) (info)->request_pos 

#define my_b_get_bytes_in_buffer(info) (char*) (info)->read_end -   \

  (char*) my_b_get_buffer_start(info)

#define my_b_get_pos_in_file(info) (info)->pos_in_file



/* tell write offset in the SEQ_APPEND cache */

int      my_b_copy_to_file(IO_CACHE *cache, FILE *file);

my_off_t my_b_append_tell(IO_CACHE* info);

mysql-test/include/show_binlog_events2.inc

+1 −5
Original line number Diff line number Diff line 
#

# Differs slightly from show_binlog events in showing server_id

# which is important for some tests

#

--let $binlog_start=106

--let $binlog_start=98

--replace_result $binlog_start <binlog_start>

--replace_column 2 # 5 #

--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/

mysql-test/r/rpl_loaddata_map.result

0 → 100644
+28 −0
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

create table t2 (id int not null primary key auto_increment);

select @@session.read_buffer_size - @@session.max_allowed_packet > 0 ;

@@session.read_buffer_size - @@session.max_allowed_packet > 0

1

load data infile 'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2;

select count(*) from t2 /* 5 000 */;

count(*)

5000

show binlog events in 'master-bin.000002' from 98;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000002	98	Query	1	#	use `test`; create table t2 (id int not null primary key auto_increment)

master-bin.000002	221	Begin_load_query	1	#	;file_id=1;block_len=7168

master-bin.000002	7412	Append_block	1	#	;file_id=1;block_len=7168

master-bin.000002	14603	Append_block	1	#	;file_id=1;block_len=2048

master-bin.000002	16674	Append_block	1	#	;file_id=1;block_len=7168

master-bin.000002	23865	Append_block	1	#	;file_id=1;block_len=341

master-bin.000002	24229	Execute_load_query	1	#	use `test`; load data infile 'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2 ;file_id=1

select count(*) from t2 /* 5 000 */;

count(*)

5000

drop table t1, t2;

end of the tests

mysql-test/r/rpl_user.result

0 → 100644
+42 −0
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

reset master;

delete from mysql.user where Host='fakehost';

create user 'foo'@'fakehost';

create user 'foo'@'fakehost', 'bar'@'fakehost';

ERROR HY000: Operation CREATE USER failed for 'foo'@'fakehost'

create user 'foo'@'fakehost', 'bar'@'fakehost';

ERROR HY000: Operation CREATE USER failed for 'foo'@'fakehost','bar'@'fakehost'

select Host,User from mysql.user where Host='fakehost';

Host	User

fakehost	bar

fakehost	foo

rename user 'foo'@'fakehost' to 'foofoo'@'fakehost';

rename user 'not_exist_user1'@'fakehost' to 'foobar'@'fakehost', 'bar'@'fakehost' to 'barbar'@'fakehost';

ERROR HY000: Operation RENAME USER failed for 'not_exist_user1'@'fakehost'

rename user 'not_exist_user1'@'fakehost' to 'foobar'@'fakehost', 'not_exist_user2'@'fakehost' to 'barfoo'@'fakehost';

ERROR HY000: Operation RENAME USER failed for 'not_exist_user1'@'fakehost','not_exist_user2'@'fakehost'

select Host,User from mysql.user where Host='fakehost';

Host	User

fakehost	barbar

fakehost	foofoo

drop user 'foofoo'@'fakehost';

drop user 'not_exist_user1'@'fakehost', 'barbar'@'fakehost';

ERROR HY000: Operation DROP USER failed for 'not_exist_user1'@'fakehost'

drop user 'not_exist_user1'@'fakehost', 'not_exist_user2'@'fakehost';

ERROR HY000: Operation DROP USER failed for 'not_exist_user1'@'fakehost','not_exist_user2'@'fakehost'

select Host,User from mysql.user where Host='fakehost';

Host	User

show binlog events from 98;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	98	Query	1	#	use `test`; delete from mysql.user where Host='fakehost'

master-bin.000001	205	Query	1	#	use `test`; create user 'foo'@'fakehost'

master-bin.000001	296	Query	1	#	use `test`; create user 'foo'@'fakehost', 'bar'@'fakehost'

master-bin.000001	405	Query	1	#	use `test`; rename user 'foo'@'fakehost' to 'foofoo'@'fakehost'

master-bin.000001	519	Query	1	#	use `test`; rename user 'not_exist_user1'@'fakehost' to 'foobar'@'fakehost', 'bar'@'fakehost' to 'barbar'@'fakehost'

master-bin.000001	686	Query	1	#	use `test`; drop user 'foofoo'@'fakehost'

master-bin.000001	778	Query	1	#	use `test`; drop user 'not_exist_user1'@'fakehost', 'barbar'@'fakehost'