Commit 5f065c54 authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/usr/home/ram/work/mysql-5.0
parents 0802a8a3 3796e37c

mysql-test/r/archive.result

+2 −0
Original line number Diff line number Diff line
@@ -6254,6 +6254,7 @@ auto fld1 companynr fld3 fld4 fld5 fld6 
3	011402	37	Romans	scholastics	jarring	

4	011403	37	intercepted	audiology	tinily	

DELETE FROM t2;

ERROR HY000: Table storage engine for 't2' doesn't have this option

SELECT * FROM t2;

auto	fld1	companynr	fld3	fld4	fld5	fld6

1	000001	00	Omaha	teethe	neat
@@ -8685,6 +8686,7 @@ auto fld1 companynr fld3 fld4 fld5 fld6 
3	011402	37	Romans	scholastics	jarring	

4	011403	37	intercepted	audiology	tinily	

TRUNCATE TABLE t2;

ERROR HY000: Table storage engine for 't2' doesn't have this option

SELECT * FROM t2;

auto	fld1	companynr	fld3	fld4	fld5	fld6

1	000001	00	Omaha	teethe	neat

mysql-test/r/auto_increment.result

+22 −0
Original line number Diff line number Diff line
@@ -378,6 +378,28 @@ t1 CREATE TABLE `t1` ( 
  KEY `t1_name` (`t1_name`)

) ENGINE=MyISAM AUTO_INCREMENT=1003 DEFAULT CHARSET=latin1

DROP TABLE `t1`;

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

create table t2(a int not null auto_increment primary key, t1a int);

insert into t1 values(NULL);

insert into t2 values (NULL, LAST_INSERT_ID()), (NULL, LAST_INSERT_ID());

insert into t1 values (NULL);

insert into t2 values (NULL, LAST_INSERT_ID()), (NULL, LAST_INSERT_ID()),

(NULL, LAST_INSERT_ID());

insert into t1 values (NULL);

insert into t2 values (NULL, LAST_INSERT_ID()), (NULL, LAST_INSERT_ID()),

(NULL, LAST_INSERT_ID()), (NULL, LAST_INSERT_ID());

select * from t2;

a	t1a

1	1

2	1

3	2

4	2

5	2

6	3

7	3

8	3

9	3

drop table t1, t2;

End of 4.1 tests

CREATE TABLE t1 ( `a` int(11) NOT NULL auto_increment, `b` int(11) default NULL,PRIMARY KEY  (`a`),UNIQUE KEY `b` (`b`));

insert into t1 (b) values (1);

mysql-test/r/rpl_log.result

+17 −0
Original line number Diff line number Diff line
@@ -101,3 +101,20 @@ Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File 
#	127.0.0.1	root	MASTER_PORT	1	master-bin.000002	510	#	#	master-bin.000002	Yes	Yes							0		0	510	#	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

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

insert into t1 values (NULL, 1);

reset master;

set insert_id=5;

insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());

show binlog events;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

slave-bin.000001	4	Format_desc	2	98	Server ver: VERSION, Binlog ver: 4

slave-bin.000001	98	Intvar	2	126	LAST_INSERT_ID=1

slave-bin.000001	126	Intvar	2	154	INSERT_ID=5

slave-bin.000001	154	Query	2	289	use `test`; insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id())

select * from t1;

a	b

1	1

5	1

6	1

drop table t1;

mysql-test/t/archive.test

+2 −0
Original line number Diff line number Diff line
@@ -1330,12 +1330,14 @@ SELECT * FROM t2; 
#

# For bug #12836

# Delete was allowing all rows to be removed

--error 1031

DELETE FROM t2;

SELECT * FROM t2;

INSERT INTO t2 VALUES (2,011401,37,'breaking','dreaded','Steinberg','W');

INSERT INTO t2 VALUES (3,011402,37,'Romans','scholastics','jarring','');

INSERT INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');

SELECT * FROM t2;

--error 1031

TRUNCATE TABLE t2;

SELECT * FROM t2;

mysql-test/t/auto_increment.test

+17 −0
Original line number Diff line number Diff line
@@ -238,6 +238,23 @@ SHOW CREATE TABLE `t1`; 


DROP TABLE `t1`;



#

# Bug #6880: LAST_INSERT_ID() within a statement

#



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

create table t2(a int not null auto_increment primary key, t1a int);     

insert into t1 values(NULL);

insert into t2 values (NULL, LAST_INSERT_ID()), (NULL, LAST_INSERT_ID());

insert into t1 values (NULL);

insert into t2 values (NULL, LAST_INSERT_ID()), (NULL, LAST_INSERT_ID()),

(NULL, LAST_INSERT_ID());

insert into t1 values (NULL);                                            

insert into t2 values (NULL, LAST_INSERT_ID()), (NULL, LAST_INSERT_ID()),

(NULL, LAST_INSERT_ID()), (NULL, LAST_INSERT_ID());

select * from t2;

drop table t1, t2;



--echo End of 4.1 tests



#