Commit a6807551 authored by unknown's avatar unknown
Browse files

Manual merge 


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents e2bf3f03 907acc78

mysql-test/r/insert_select.result

+5 −0
Original line number Diff line number Diff line
@@ -690,3 +690,8 @@ CREATE TABLE t1 (a int PRIMARY KEY); 
INSERT INTO t1 values (1), (2);

INSERT INTO t1 SELECT a + 2 FROM t1 LIMIT 1;

DROP TABLE t1;

CREATE TABLE t1 (x int, y int);

CREATE TABLE t2 (z int, y int);

CREATE TABLE t3 (a int, b int);

INSERT INTO t3 (SELECT x, y FROM t1 JOIN t2 USING (y) WHERE z = 1);

DROP TABLE IF EXISTS t1,t2,t3;

mysql-test/r/key.result

+10 −0
Original line number Diff line number Diff line
@@ -330,6 +330,16 @@ alter table t1 add key (c1,c1,c2); 
ERROR 42S21: Duplicate column name 'c1'

drop table t1;

create table t1 (

i1 INT NOT NULL,

i2 INT NOT NULL,

UNIQUE i1idx (i1),

UNIQUE i2idx (i2));

desc t1;

Field	Type	Null	Key	Default	Extra

i1	int(11)	NO	UNI		

i2	int(11)	NO	UNI		

drop table t1;

create table t1 (

c1 int,

c2 varchar(20) not null,

primary key (c1),

mysql-test/r/view_grant.result

+12 −0
Original line number Diff line number Diff line
@@ -649,3 +649,15 @@ DROP VIEW mysqltest_db1.view1; 
DROP TABLE mysqltest_db1.t1;

DROP SCHEMA mysqltest_db1;

DROP USER mysqltest_db1@localhost;

CREATE DATABASE test1;

CREATE DATABASE test2;

CREATE TABLE test1.t0 (a VARCHAR(20));

CREATE TABLE test2.t1 (a VARCHAR(20));

CREATE VIEW  test2.t3 AS SELECT * FROM test1.t0;

CREATE OR REPLACE VIEW test.v1 AS 

SELECT ta.a AS col1, tb.a AS col2 FROM test2.t3 ta, test2.t1 tb;

DROP VIEW test.v1;

DROP VIEW test2.t3;

DROP TABLE test2.t1, test1.t0;

DROP DATABASE test2;

DROP DATABASE test1;

mysql-test/t/insert_select.test

+9 −0
Original line number Diff line number Diff line
@@ -238,3 +238,12 @@ INSERT INTO t1 SELECT a + 2 FROM t1 LIMIT 1; 
DROP TABLE t1;



# End of 4.1 tests



#

# Bug #18080: INSERT ... SELECT ... JOIN results in ambiguous field list error

#

CREATE TABLE t1 (x int, y int);

CREATE TABLE t2 (z int, y int);

CREATE TABLE t3 (a int, b int);

INSERT INTO t3 (SELECT x, y FROM t1 JOIN t2 USING (y) WHERE z = 1);

DROP TABLE IF EXISTS t1,t2,t3;

mysql-test/t/key.test

+11 −0
Original line number Diff line number Diff line
@@ -325,6 +325,17 @@ alter table t1 add key (c1,c2,c1); 
alter table t1 add key (c1,c1,c2);

drop table t1;



#

# Bug#11228: DESC shows arbitrary column as "PRI"

#

create table t1 (

 i1 INT NOT NULL,

 i2 INT NOT NULL,

 UNIQUE i1idx (i1),

 UNIQUE i2idx (i2));

desc t1;

drop table t1;



#

# Bug#12565 - ERROR 1034 when running simple UPDATE or DELETE 

#             on large MyISAM table