Commit 4c9d090a authored by unknown's avatar unknown
Browse files

Post-merge fix.

parent 21df932d

mysql-test/r/information_schema.result

+11 −0
Original line number Diff line number Diff line
@@ -1377,10 +1377,21 @@ COLLATIONS information_schema.COLLATIONS 1 
COLLATION_CHARACTER_SET_APPLICABILITY	information_schema.COLLATION_CHARACTER_SET_APPLICABILITY	1

COLUMNS	information_schema.COLUMNS	1

COLUMN_PRIVILEGES	information_schema.COLUMN_PRIVILEGES	1

ENGINES	information_schema.ENGINES	1

EVENTS	information_schema.EVENTS	1

FILES	information_schema.FILES	1

GLOBAL_STATUS	information_schema.GLOBAL_STATUS	1

GLOBAL_VARIABLES	information_schema.GLOBAL_VARIABLES	1

KEY_COLUMN_USAGE	information_schema.KEY_COLUMN_USAGE	1

PARTITIONS	information_schema.PARTITIONS	1

PLUGINS	information_schema.PLUGINS	1

PROCESSLIST	information_schema.PROCESSLIST	1

REFERENTIAL_CONSTRAINTS	information_schema.REFERENTIAL_CONSTRAINTS	1

ROUTINES	information_schema.ROUTINES	1

SCHEMATA	information_schema.SCHEMATA	1

SCHEMA_PRIVILEGES	information_schema.SCHEMA_PRIVILEGES	1

SESSION_STATUS	information_schema.SESSION_STATUS	1

SESSION_VARIABLES	information_schema.SESSION_VARIABLES	1

STATISTICS	information_schema.STATISTICS	1

TABLES	information_schema.TABLES	1

TABLE_CONSTRAINTS	information_schema.TABLE_CONSTRAINTS	1

mysql-test/r/insert_select.result

+0 −14
Original line number Diff line number Diff line
@@ -717,17 +717,3 @@ select * from t1; 
f1	f2

1	2

drop table t1;
 
create table t1(f1 int primary key auto_increment, f2 int unique);

insert into t1(f2) values(1);

select @@identity;

@@identity

1

insert ignore t1(f2) values(1);

select @@identity;

@@identity

0

insert ignore t1(f2) select 1;

select @@identity;

@@identity

0

drop table t1;

mysql-test/r/update.result

+3 −3
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ Handler_read_key 2 
Handler_read_next	0

Handler_read_prev	0

Handler_read_rnd	0

Handler_read_rnd_next	7

Handler_read_rnd_next	0

UPDATE t1 SET user_id=null WHERE request_id=9999999999999;

show status like '%Handler_read%';

Variable_name	Value
@@ -423,7 +423,7 @@ Handler_read_key 3 
Handler_read_next	0

Handler_read_prev	0

Handler_read_rnd	0

Handler_read_rnd_next	14

Handler_read_rnd_next	0

UPDATE t1 SET user_id=null WHERE request_id=999999999999999999999999999999;

show status like '%Handler_read%';

Variable_name	Value
@@ -432,5 +432,5 @@ Handler_read_key 3 
Handler_read_next	0

Handler_read_prev	0

Handler_read_rnd	0

Handler_read_rnd_next	21

Handler_read_rnd_next	0

DROP TABLE t1;

mysql-test/r/view.result

+4 −4
Original line number Diff line number Diff line
@@ -3079,8 +3079,8 @@ f1 f2 
1	3

2	3

explain extended select * from v1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	6	Using filesort

id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	6	100.00	Using filesort

Warnings:

Note	1003	select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` order by `test`.`t1`.`f2`

select * from v1 order by f1;
@@ -3092,8 +3092,8 @@ f1 f2 
2	2

2	3

explain extended select * from v1 order by f1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	6	Using filesort

id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	6	100.00	Using filesort

Warnings:

Note	1003	select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` order by `test`.`t1`.`f1`,`test`.`t1`.`f2`

drop view v1;

mysql-test/t/insert_select.test

+0 −13
Original line number Diff line number Diff line
@@ -279,16 +279,3 @@ insert into t1 values (1,1) on duplicate key update f2=2; 
--disable_info

select * from t1;

drop table t1;
 


#

# Bug#23170: LAST_INSERT_ID isn't reset to 0 in INSERT .. SELECT if no rows

#            were inserted.

#

create table t1(f1 int primary key auto_increment, f2 int unique);

insert into t1(f2) values(1);

select @@identity;

insert ignore t1(f2) values(1);

select @@identity;

insert ignore t1(f2) select 1;

select @@identity;

drop table t1;