Commit 504ab8d4 authored by unknown's avatar unknown
Browse files

merge 


sql/sql_parse.cc:
  Auto merged
parents dddabc7e 5ac4670b

include/violite.h

+2 −2
Original line number Diff line number Diff line
@@ -138,8 +138,8 @@ int vio_close_shared_memory(Vio * vio); 
#if defined(HAVE_VIO) && !defined(DONT_MAP_VIO)

#define vio_delete(vio) 			(vio)->viodelete(vio)

#define vio_errno(vio)	 			(vio)->vioerrno(vio)

#define vio_read(vio, buf, size) 		(vio)->read(vio,buf,size)

#define vio_write(vio, buf, size) 		(vio)->write(vio, buf, size)

#define vio_read(vio, buf, size)                ((vio)->read)(vio,buf,size)

#define vio_write(vio, buf, size)               ((vio)->write)(vio, buf, size)

#define vio_blocking(vio, set_blocking_mode, old_mode)\

 	(vio)->vioblocking(vio, set_blocking_mode, old_mode)

#define vio_is_blocking(vio) 			(vio)->is_blocking(vio)

mysql-test/r/ctype_cp1251.result

+2 −2
Original line number Diff line number Diff line 
drop table if exists t1;

SET NAMES cp1251;

create table t1 (a varchar(10) not null);

create table t1 (a varchar(10) not null) character set cp1251;

insert into t1 values ("a"),("ab"),("abc");

select * from t1;

a
@@ -23,7 +23,7 @@ a 
b

c

drop table t1;

create table t1 (a char(15) binary, b binary(15));

create table t1 (a char(15) binary, b binary(15)) character set cp1251;

insert into t1 values ('aaa','bbb'),('AAA','BBB');

select upper(a),upper(b) from t1;

upper(a)	upper(b)

mysql-test/r/group_by.result

+25 −0
Original line number Diff line number Diff line
@@ -677,3 +677,28 @@ select sum(a)*sum(b) as d from t1 where a=1 group by c having d > 0; 
d

10

drop table t1;

create table t1(a int);

insert into t1 values (0),(1),(2),(3),(4),(5),(6),(8),(9);

create table t2 (

a int,

b varchar(200) NOT NULL,

c varchar(50) NOT NULL,

d varchar(100) NOT NULL,

primary key (a,b(132),c,d),

key a (a,b)

) charset=utf8;

insert into t2 select 

x3.a,  -- 3

concat('val-', x3.a + 3*x4.a), -- 12

concat('val-', @a:=x3.a + 3*x4.a + 12*C.a), -- 120

concat('val-', @a + 120*D.a)

from t1 x3, t1 x4, t1 C, t1 D where x3.a < 3 and x4.a < 4 and D.a < 4;

delete from t2  where a = 2 and b = 'val-2' limit 30;

explain select c from t2 where a = 2 and b = 'val-2' group by c;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ref	PRIMARY,a	PRIMARY	400	const,const	6	Using where

select c from t2 where a = 2 and b = 'val-2' group by c;

c

val-74

val-98

drop table t1,t2;

mysql-test/t/ctype_cp1251-master.opt

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
--default-character-set=cp1251 --new

mysql-test/t/ctype_cp1251.test

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ SET NAMES cp1251; 
# Test problem with LEFT() (Bug #514)

#



create table t1 (a varchar(10) not null);

create table t1 (a varchar(10) not null) character set cp1251;

insert into t1 values ("a"),("ab"),("abc");

select * from t1;

select a, left(a,1) as b from t1;
@@ -21,7 +21,7 @@ drop table t1; 
#

# Test of binary and upper/lower

#

create table t1 (a char(15) binary, b binary(15));

create table t1 (a char(15) binary, b binary(15)) character set cp1251;

insert into t1 values ('aaa','bbb'),('AAA','BBB');

select upper(a),upper(b) from t1;

select lower(a),lower(b) from t1;