Commit d501c406 authored by hezx@mail.hezx.com's avatar hezx@mail.hezx.com
Browse files

Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#28908/5.0

into  mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#28908/mysql-5.0-rpl
parents 2b4bc3e9 c5b597bc
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -530,6 +530,12 @@ typedef int (*qsort2_cmp)(const void *, const void *, const void *);
#define my_b_tell(info) ((info)->pos_in_file + \
			 (uint) (*(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 */
my_off_t my_b_append_tell(IO_CACHE* info);
my_off_t my_b_safe_tell(IO_CACHE* info); /* picks the correct tell() */
+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
+10000 −0

File added.

Preview size limit exceeded, changes collapsed.

+5000 −0

File added.

Preview size limit exceeded, changes collapsed.

+1 −0
Original line number Diff line number Diff line
--read_buffer_size=9K --max_allowed_packet=8K
Loading