Commit f75e79e0 authored by unknown's avatar unknown
Browse files

After merge fix

parent 749091a9

mysql-test/extra/rpl_tests/rpl_insert_id.test

+21 −1
Original line number Diff line number Diff line
@@ -84,9 +84,28 @@ SET FOREIGN_KEY_CHECKS=0; 
--error 1022, 1062

INSERT INTO t1 VALUES (1),(1);

sync_slave_with_master;

connection master;

drop table t1;

sync_slave_with_master;



# End of 4.1 tests

 

#

# Bug#14553: NULL in WHERE resets LAST_INSERT_ID

#

connection master;

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

create table t2(a int);

insert into t1 (a) values (null);

insert into t2 (a) select a from t1 where a is null;

insert into t2 (a) select a from t1 where a is null;

select * from t2;

sync_slave_with_master;

connection slave;

select * from t2;

connection master;

drop table t1;

drop table t2;



#

# BUG#15728: LAST_INSERT_ID function inside a stored function returns 0
@@ -274,3 +293,4 @@ drop table t1, t2; 
drop function insid;



sync_slave_with_master;

mysql-test/r/information_schema.result

+14 −0
Original line number Diff line number Diff line
@@ -1238,7 +1238,14 @@ COLLATIONS COLLATION_NAME 
COLLATION_CHARACTER_SET_APPLICABILITY	COLLATION_NAME

COLUMNS	TABLE_SCHEMA

COLUMN_PRIVILEGES	TABLE_SCHEMA

ENGINES	ENGINE

EVENTS	EVENT_SCHEMA

FILES	TABLE_SCHEMA

KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA

PARTITIONS	TABLE_SCHEMA

PLUGINS	PLUGIN_NAME

PROCESSLIST	ID

REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA

ROUTINES	ROUTINE_SCHEMA

SCHEMATA	SCHEMA_NAME

SCHEMA_PRIVILEGES	TABLE_SCHEMA
@@ -1269,7 +1276,14 @@ COLLATIONS COLLATION_NAME 
COLLATION_CHARACTER_SET_APPLICABILITY	COLLATION_NAME

COLUMNS	TABLE_SCHEMA

COLUMN_PRIVILEGES	TABLE_SCHEMA

ENGINES	ENGINE

EVENTS	EVENT_SCHEMA

FILES	TABLE_SCHEMA

KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA

PARTITIONS	TABLE_SCHEMA

PLUGINS	PLUGIN_NAME

PROCESSLIST	ID

REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA

ROUTINES	ROUTINE_SCHEMA

SCHEMATA	SCHEMA_NAME

SCHEMA_PRIVILEGES	TABLE_SCHEMA

mysql-test/r/rpl_insert_id.result

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ CREATE TABLE t1 ( a INT UNIQUE ); 
SET FOREIGN_KEY_CHECKS=0;

INSERT INTO t1 VALUES (1),(1);

Got one of the listed errors

drop table t1;

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

create table t2(a int);

insert into t1 (a) values (null);

mysql-test/r/select.result

+1 −1
Original line number Diff line number Diff line
@@ -3475,7 +3475,7 @@ SELECT 0.9888889889 * 1.011111411911; 
0.9998769417899202067879

prepare stmt from 'select 1 as " a "';

Warnings:

Warning	1466	Leading spaces are removed from name ' a '

Warning	1546	Leading spaces are removed from name ' a '

execute stmt;

a 

1

mysql-test/r/union.result

+7 −7
Original line number Diff line number Diff line
@@ -1311,14 +1311,14 @@ create table t2 as select *, f6 as f8 from t1 union select *, f7 from t1; 
show create table t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `f1` char(1) default NULL,

  `f2` char(5) default NULL,

  `f3` binary(1) default NULL,

  `f4` binary(5) default NULL,

  `f5` timestamp NOT NULL default '0000-00-00 00:00:00',

  `f6` varchar(1) character set utf8 default NULL,

  `f1` char(1) DEFAULT NULL,

  `f2` char(5) DEFAULT NULL,

  `f3` binary(1) DEFAULT NULL,

  `f4` binary(5) DEFAULT NULL,

  `f5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',

  `f6` varchar(1) CHARACTER SET utf8 DEFAULT NULL,

  `f7` text,

  `f8` text character set utf8

  `f8` text CHARACTER SET utf8

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1, t2;

(select avg(1)) union (select avg(1)) union (select avg(1)) union