Commit f7320377 authored by unknown's avatar unknown
Browse files

merge 


sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Auto merged
parents 7866bf64 dd37fca2

mysql-test/r/distinct.result

+0 −8
Original line number Diff line number Diff line
@@ -464,14 +464,6 @@ SELECT DISTINCT html,SUM(rout)/(SUM(rin)+1) as 'prod' FROM t1 GROUP BY rin; 
html	prod

1	0.0000

drop table t1;

create table t1 (id int, dsc varchar(50));

insert into t1 values (1, "line number one"), (2, "line number two"), (3, "line number three");

select distinct id, IFNULL(dsc, '-') from t1;

id	IFNULL(dsc, '-')

1	line number one

2	line number two

3	line number three

drop table t1;

CREATE TABLE t1 (a int);

INSERT INTO t1 VALUES (1),(2),(3),(4),(5);

SELECT DISTINCT a, 1 FROM t1;

mysql-test/r/information_schema.result

+10 −10
Original line number Diff line number Diff line
@@ -360,12 +360,12 @@ latin1_spanish_ci 
show keys from v4;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

select * from information_schema.views where TABLE_NAME like "v%";

TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE

NULL	test	v0	select sql_no_cache `schemata`.`SCHEMA_NAME` AS `c` from `information_schema`.`schemata`	NONE	NO

NULL	test	v1	select sql_no_cache `tables`.`TABLE_NAME` AS `c` from `information_schema`.`tables` where (`tables`.`TABLE_NAME` = _utf8'v1')	NONE	NO

NULL	test	v2	select sql_no_cache `columns`.`COLUMN_NAME` AS `c` from `information_schema`.`columns` where (`columns`.`TABLE_NAME` = _utf8'v2')	NONE	NO

NULL	test	v3	select sql_no_cache `character_sets`.`CHARACTER_SET_NAME` AS `c` from `information_schema`.`character_sets` where (`character_sets`.`CHARACTER_SET_NAME` like _utf8'latin1%')	NONE	NO

NULL	test	v4	select sql_no_cache `collations`.`COLLATION_NAME` AS `c` from `information_schema`.`collations` where (`collations`.`COLLATION_NAME` like _utf8'latin1%')	NONE	NO

TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE

NULL	test	v0	select sql_no_cache `schemata`.`SCHEMA_NAME` AS `c` from `information_schema`.`schemata`	NONE	NO	root@localhos	DEFINER

NULL	test	v1	select sql_no_cache `tables`.`TABLE_NAME` AS `c` from `information_schema`.`tables` where (`tables`.`TABLE_NAME` = _utf8'v1')	NONE	NO	root@localhos	DEFINER

NULL	test	v2	select sql_no_cache `columns`.`COLUMN_NAME` AS `c` from `information_schema`.`columns` where (`columns`.`TABLE_NAME` = _utf8'v2')	NONE	NO	root@localhos	DEFINER

NULL	test	v3	select sql_no_cache `character_sets`.`CHARACTER_SET_NAME` AS `c` from `information_schema`.`character_sets` where (`character_sets`.`CHARACTER_SET_NAME` like _utf8'latin1%')	NONE	NO	root@localhos	DEFINER

NULL	test	v4	select sql_no_cache `collations`.`COLLATION_NAME` AS `c` from `information_schema`.`collations` where (`collations`.`COLLATION_NAME` like _utf8'latin1%')	NONE	NO	root@localhos	DEFINER

drop view v0, v1, v2, v3, v4;

create table t1 (a int);

grant select,update,insert on t1 to mysqltest_1@localhost;
@@ -455,10 +455,10 @@ create view v1 (c) as select a from t1 with check option; 
create view v2 (c) as select a from t1 WITH LOCAL CHECK OPTION;

create view v3 (c) as select a from t1 WITH CASCADED CHECK OPTION;

select * from information_schema.views;

TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE

NULL	test	v1	select `test`.`t1`.`a` AS `c` from `test`.`t1`	CASCADED	YES

NULL	test	v2	select `test`.`t1`.`a` AS `c` from `test`.`t1`	LOCAL	YES

NULL	test	v3	select `test`.`t1`.`a` AS `c` from `test`.`t1`	CASCADED	YES

TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE

NULL	test	v1	select `test`.`t1`.`a` AS `c` from `test`.`t1`	CASCADED	YES	root@localhos	DEFINER

NULL	test	v2	select `test`.`t1`.`a` AS `c` from `test`.`t1`	LOCAL	YES	root@localhos	DEFINER

NULL	test	v3	select `test`.`t1`.`a` AS `c` from `test`.`t1`	CASCADED	YES	root@localhos	DEFINER

grant select (a) on test.t1 to joe@localhost with grant option;

select * from INFORMATION_SCHEMA.COLUMN_PRIVILEGES;

GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	PRIVILEGE_TYPE	IS_GRANTABLE

mysql-test/r/insert_select.result

+0 −10
Original line number Diff line number Diff line
@@ -668,13 +668,3 @@ ERROR 42S22: Unknown column 't2.a' in 'field list' 
insert into t1 select t2.a from t2 group by t2.a on duplicate key update a= t1.a + t2.b;

ERROR 42S22: Unknown column 't2.b' in 'field list'

drop table t1,t2,t3;
 
create table t1(f1 varchar(5) key);

insert into t1(f1) select if(max(f1) is null, '2000',max(f1)+1) from t1;

insert into t1(f1) select if(max(f1) is null, '2000',max(f1)+1) from t1;

insert into t1(f1) select if(max(f1) is null, '2000',max(f1)+1) from t1;

select * from t1;

f1

2000

2001

2002

drop table t1;

mysql-test/r/olap.result

+12 −0
Original line number Diff line number Diff line
@@ -580,6 +580,18 @@ a LENGTH(a) COUNT(*) 
2	1	1

NULL	NULL	2

DROP TABLE t1;

create table t1 ( a varchar(9), b int );

insert into t1 values('a',1),(null,2);

select a, max(b) from t1 group by a with rollup;

a	max(b)

NULL	2

a	1

NULL	2

select distinct a, max(b) from t1 group by a with rollup;

a	max(b)

NULL	2

a	1

drop table t1;

CREATE TABLE t1(id int, type char(1));

INSERT INTO t1 VALUES

(1,"A"),(2,"C"),(3,"A"),(4,"A"),(5,"B"),

mysql-test/r/view.result

+5 −0
Original line number Diff line number Diff line
@@ -2205,6 +2205,11 @@ select * from (select f1 as f2 from v1) v where v.f2='a'; 
f2

drop view v1;

drop table t1;

create view v1 as SELECT CONVERT_TZ('2004-01-01 12:00:00','GMT','MET');

select * from v1;

CONVERT_TZ('2004-01-01 12:00:00','GMT','MET')

NULL

drop view v1;

CREATE TABLE t1 (date DATE NOT NULL);

INSERT INTO  t1 VALUES ('2005-09-06');

CREATE VIEW v1 AS SELECT DAYNAME(date) FROM t1;