Commit 42557374 authored by unknown's avatar unknown
Browse files

Merge 


mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/select_found.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
strings/ctype-bin.c:
  Auto merged
sql/sql_select.cc:
  SCCS merged
parents 679088a2 1a3ee0de

mysql-test/r/ctype_cp1251.result

+16 −0
Original line number Diff line number Diff line
@@ -54,3 +54,19 @@ select collation(a), collation(b), collation(binary 'ccc') from t1 limit 1; 
collation(a)	collation(b)	collation(binary 'ccc')

cp1251_bin	binary	binary

drop table t1;

create table t1 (

a varchar(16) character set cp1251 collate cp1251_bin not null,

b int(10) default null,

primary key(a)

) charset=cp1251;

insert into t1 (a) values ('air'),

('we'),('g'),('we_toshko'), ('s0urce'),('we_ivo'),('we_iliyan'),

('we_martin'),('vw_grado'),('vw_vasko'),('tn_vili'),('tn_kalina'),

('tn_fakira'),('vw_silvia'),('vw_starshi'),('vw_geo'),('vw_b0x1');

select * from t1 where a like 'we_%';

a	b

we_iliyan	NULL

we_ivo	NULL

we_martin	NULL

we_toshko	NULL

drop table t1;

mysql-test/r/func_group.result

+9 −0
Original line number Diff line number Diff line
@@ -757,6 +757,15 @@ one 2 
two	2

three	1

drop table t1;

create table t1(a int, b datetime);

insert into t1 values (1, NOW()), (2, NOW());

create table t2 select MAX(b) from t1 group by a;

show create table t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `MAX(b)` datetime default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1, t2;

create table t1(f1 datetime);

insert into t1 values (now());

create table t2 select f2 from (select max(now()) f2 from t1) a;

mysql-test/r/ps.result

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ FOUND_ROWS() 
1

execute stmt1;

FOUND_ROWS()

0

1

deallocate prepare stmt1;

drop table t1;

create table t1

mysql-test/r/select_found.result

+25 −0
Original line number Diff line number Diff line
@@ -246,6 +246,31 @@ SELECT FOUND_ROWS(); 
FOUND_ROWS()

0

DROP TABLE t1;

SELECT 'foo';

foo

foo

SELECT FOUND_ROWS();

FOUND_ROWS()

1

SELECT SQL_CALC_FOUND_ROWS 'foo';

foo

foo

SELECT FOUND_ROWS();

FOUND_ROWS()

1

SELECT SQL_CALC_FOUND_ROWS 'foo' limit 0;

foo

SELECT FOUND_ROWS();

FOUND_ROWS()

1

SELECT FOUND_ROWS();

FOUND_ROWS()

1

SELECT SQL_CALC_FOUND_ROWS 'foo' UNION SELECT 'bar' LIMIT 0;

foo

SELECT FOUND_ROWS();

FOUND_ROWS()

2

CREATE TABLE t1 (a int, b int);

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

SELECT SQL_CALC_FOUND_ROWS DISTINCT 'a' FROM t1 GROUP BY b LIMIT 2;

mysql-test/r/select_safe.result

+15 −0
Original line number Diff line number Diff line
@@ -78,4 +78,19 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t2	ref	b	b	21	test.t1.b	6	Using where

SET MAX_SEEKS_FOR_KEY=DEFAULT;

drop table t1;

create table t1 (a int);

insert into t1 values (1),(2),(3),(4),(5);

insert into t1 select * from t1;

insert into t1 select * from t1;

insert into t1 select * from t1;

set local  max_join_size=8;

select * from (select * from t1) x;

ERROR 42000: The SELECT would examine more than MAX_JOIN_SIZE rows; check your WHERE and use SET SQL_BIG_SELECTS=1 or SET SQL_MAX_JOIN_SIZE=# if the SELECT is okay

set local  max_join_size=1;

select * from (select * from t1 a, t1 b) x;

ERROR 42000: The SELECT would examine more than MAX_JOIN_SIZE rows; check your WHERE and use SET SQL_BIG_SELECTS=1 or SET SQL_MAX_JOIN_SIZE=# if the SELECT is okay

set local  max_join_size=1;

select * from (select 1 union select 2 union select 3) x;

ERROR 42000: The SELECT would examine more than MAX_JOIN_SIZE rows; check your WHERE and use SET SQL_BIG_SELECTS=1 or SET SQL_MAX_JOIN_SIZE=# if the SELECT is okay

drop table t1;

SET SQL_SAFE_UPDATES=0,SQL_SELECT_LIMIT=DEFAULT, SQL_MAX_JOIN_SIZE=DEFAULT;