Commit 9939a66b authored by unknown's avatar unknown
Browse files

Merge gbichot3.local:/home/mysql_src/mysql-5.1-interval-move-next-insert-id 

into  gbichot3.local:/home/mysql_src/mysql-5.1


sql/ha_federated.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/handler.cc:
  will fix by hand
mysql-test/extra/rpl_tests/rpl_insert_id.test:
  merge
mysql-test/r/rpl_insert_id.result:
  merge
sql/sql_insert.cc:
  merge
parents e0ef4b1e 60272e75

mysql-test/extra/binlog_tests/binlog.test

+32 −0
Original line number Diff line number Diff line
@@ -49,3 +49,35 @@ show binlog events in 'master-bin.000001' from 102; 
--replace_column 2 # 5 #

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

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



# Test of a too big SET INSERT_ID: see if the truncated value goes

# into binlog (right), or the too big value (wrong); we look at the

# binlog further down with SHOW BINLOG EVENTS.

reset master;

create table t1 (id tinyint auto_increment primary key);

set insert_id=128;

insert into t1 values(null);

select * from t1;

drop table t1;



# Test of binlogging of INSERT_ID with INSERT DELAYED

create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;

# First, avoid BUG#20627:

set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;

# Verify that only one INSERT_ID event is binlogged.

insert delayed into t1 values (207);



# We use sleeps between statements, that's the only way to get a

# repeatable binlog in a normal test run and under Valgrind.

# It may be that the "binlog missing rows" of BUG#20821 shows up

# here.

sleep 2;

insert delayed into t1 values (null);

sleep 2;

insert delayed into t1 values (300);

sleep 2; # time for the delayed queries to reach disk

select * from t1;

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

show binlog events from 102;

drop table t1;

mysql-test/extra/rpl_tests/rpl_insert_id.test

+53 −0
Original line number Diff line number Diff line
@@ -144,6 +144,23 @@ insert into t1 (last_id) values (bug15728()); 
# This should be exactly one greater than in the previous call.

select last_insert_id();



# BUG#20339 - stored procedure using LAST_INSERT_ID() does not

# replicate statement-based

--disable_warnings

drop procedure if exists foo;

--enable_warnings

delimiter |;

create procedure foo()

begin

  declare res int;

  insert into t2 (last_id) values (bug15728());

  insert into t1 (last_id) values (bug15728());

end|

delimiter ;|

call foo();



select * from t1;

select * from t2;

save_master_pos;

connection slave;

sync_with_master;
@@ -154,6 +171,7 @@ connection master; 
drop function bug15728;

drop function bug15728_insert;

drop table t1, t2;

drop procedure foo;



# test of BUG#20188 REPLACE or ON DUPLICATE KEY UPDATE in

# auto_increment breaks binlog
@@ -220,4 +238,39 @@ drop table t1; 


# End of 5.0 tests



# Test for BUG#20341 "stored function inserting into one

# auto_increment puts bad data in slave"



truncate table t2;

create table t1 (id tinyint primary key); # no auto_increment



delimiter |;

create function insid() returns int

begin

  insert into t2 (last_id) values (0);

  return 0;

end|

delimiter ;|

set sql_log_bin=0;

insert into t2 (id) values(1),(2),(3);

delete from t2;

set sql_log_bin=1;

#inside SELECT, then inside INSERT

select insid();

set sql_log_bin=0;

insert into t2 (id) values(5),(6),(7);

delete from t2 where id>=5;

set sql_log_bin=1;

insert into t1 select insid();

select * from t1;

select * from t2;



sync_slave_with_master;

select * from t1;

select * from t2;



connection master;

drop table t1, t2;

drop function insid;



sync_slave_with_master;

mysql-test/extra/rpl_tests/rpl_loaddata.test

+3 −0
Original line number Diff line number Diff line
@@ -20,8 +20,11 @@ connection slave; 
reset master;

connection master;



select last_insert_id();

create table t1(a int not null auto_increment, b int, primary key(a) );

load data infile '../std_data_ln/rpl_loaddata.dat' into table t1;

# verify that LAST_INSERT_ID() is set by LOAD DATA INFILE

select last_insert_id();



create temporary table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60));

load data infile '../std_data_ln/rpl_loaddata2.dat' into table t2 fields terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by '\n##\n' starting by '>' ignore 1 lines;

mysql-test/r/auto_increment.result

+56 −2
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ insert into t1 set i = null; 
ERROR 23000: Duplicate entry '255' for key 'PRIMARY'

select last_insert_id();

last_insert_id()

0

255

drop table t1;

create table t1 (i tinyint unsigned not null auto_increment, key (i));

insert into t1 set i = 254;
@@ -181,7 +181,7 @@ insert into t1 values (NULL, 10); 
ERROR 23000: Duplicate entry '10' for key 'b'

select last_insert_id();

last_insert_id()

0

2

drop table t1;

create table t1(a int auto_increment,b int null,primary key(a));

SET SQL_MODE=NO_AUTO_VALUE_ON_ZERO;
@@ -446,3 +446,57 @@ INSERT INTO t1 VALUES(1, 1); 
ALTER TABLE t1 CHANGE t1 t1 INT(10) auto_increment;

ERROR 23000: ALTER TABLE causes auto_increment resequencing, resulting in duplicate entry '1' for key 'PRIMARY'

DROP TABLE t1;

CREATE TABLE `t2` (

`k` int(11) NOT NULL auto_increment,

`a` int(11) default NULL,

`c` int(11) default NULL,

PRIMARY KEY  (`k`),

UNIQUE KEY `idx_1` (`a`)

) ENGINE=InnoDB;

insert into t2 ( a ) values ( 6 ) on duplicate key update c =

ifnull( c,

0 ) + 1;

insert into t2 ( a ) values ( 7 ) on duplicate key update c =

ifnull( c,

0 ) + 1;

select last_insert_id();

last_insert_id()

2

select * from t2;

k	a	c

1	6	NULL

2	7	NULL

insert into t2 ( a ) values ( 6 ) on duplicate key update c =

ifnull( c,

0 ) + 1;

select last_insert_id();

last_insert_id()

1

select * from t2;

k	a	c

1	6	1

2	7	NULL

insert ignore into t2 values (null,6,1),(10,8,1);

select last_insert_id();

last_insert_id()

1

insert ignore into t2 values (null,6,1),(null,8,1),(null,15,1),(null,20,1);

select last_insert_id();

last_insert_id()

11

select * from t2;

k	a	c

1	6	1

2	7	NULL

10	8	1

11	15	1

12	20	1

drop table t2;

create table t1 (a int primary key auto_increment, b int, c int, d timestamp default current_timestamp, unique(b),unique(c));

insert into t1 values(null,1,1,now());

insert into t1 values(null,0,0,null);

replace into t1 values(null,1,0,null);

select last_insert_id();

last_insert_id()

3

drop table t1;

mysql-test/r/binlog_row_binlog.result

+34 −0
Original line number Diff line number Diff line
@@ -235,3 +235,37 @@ master-bin.000001 # Rotate 1 # master-bin.000002;pos=4 
show binlog events in 'master-bin.000002' from 102;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000002	#	Query	1	#	use `test`; drop table t1

reset master;

create table t1 (id tinyint auto_increment primary key);

set insert_id=128;

insert into t1 values(null);

Warnings:

Warning	1264	Out of range value for column 'id' at row 1

select * from t1;

id

127

drop table t1;

create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;

set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;

insert delayed into t1 values (207);

insert delayed into t1 values (null);

insert delayed into t1 values (300);

select * from t1;

a

207

208

300

show binlog events from 102;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	1	#	use `test`; create table t1 (id tinyint auto_increment primary key)

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

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

master-bin.000001	#	Query	1	#	use `test`; drop table t1

master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int not null auto_increment, primary key (a)) engine=myisam

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

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

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

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

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

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

drop table t1;