Commit 1c352901 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into mishka.local:/home/my/mysql-5.0


sql/sql_show.cc:
  Auto merged
parents 9207ef4b 930a2459

include/my_global.h

+0 −12
Original line number Diff line number Diff line
@@ -235,18 +235,6 @@ C_MODE_END 
#define BAD_MEMCPY

#endif



/* In Linux-alpha we have atomic.h if we are using gcc */

#if defined(TARGET_OS_LINUX) && defined(__GNUC__) && defined(__alpha__) && (__GNUC__ > 2 || ( __GNUC__ == 2 &&  __GNUC_MINOR__ >= 95)) && !defined(HAVE_ATOMIC_ADD)

#define HAVE_ATOMIC_ADD

#define HAVE_ATOMIC_SUB

#endif



/* In Linux-ia64 including atomic.h will give us an error */

#if (defined(TARGET_OS_LINUX) && defined(__GNUC__) && (defined(__ia64__)||defined(__powerpc64__))) || !defined(THREAD)

#undef HAVE_ATOMIC_ADD

#undef HAVE_ATOMIC_SUB

#endif



#if defined(_lint) && !defined(lint)

#define lint

#endif

mysql-test/r/ctype_latin2.result

−158 B (6.26 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

mysql-test/r/information_schema.result

+3 −3
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ skip_show_database OFF 
grant select, update, execute on test.* to mysqltest_2@localhost;

grant select, update on test.* to mysqltest_1@localhost;

select * from information_schema.SCHEMATA where schema_name > 'm';

CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	SQL_PATH

NULL	mysql	latin1	NULL

NULL	test	latin1	NULL

CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH

NULL	mysql	latin1	latin1_swedish_ci	NULL

NULL	test	latin1	latin1_swedish_ci	NULL

select schema_name from information_schema.schemata;

schema_name

information_schema

mysql-test/r/select.result

+21 −0
Original line number Diff line number Diff line
@@ -2455,3 +2455,24 @@ a 
select x.a, y.a, z.a from ( (t1 x inner join t2 y on x.a=y.a) inner join t2 z on y.a=z.a) WHERE x.a=1;

a	a	a

drop table t1,t2;

create table t1 (s1 varchar(5));

insert into t1 values ('Wall');

select min(s1) from t1 group by s1 with rollup;

min(s1)

Wall

Wall

drop table t1;

create table t1 (s1 int) engine=myisam;

insert into t1 values (0);

select avg(distinct s1) from t1 group by s1 with rollup;

avg(distinct s1)

0.0000

0.0000

drop table t1;

create table t1 (s1 int);

insert into t1 values (null),(1);

select distinct avg(s1) as x from t1 group by s1 with rollup;

x

NULL

1.0000

drop table t1;

mysql-test/t/ctype_latin2.test

+7 −4
Original line number Diff line number Diff line
@@ -7,10 +7,6 @@ drop table if exists t1; 


SET NAMES latin2;

CREATE TABLE t1 (a char(1) character set latin2);

INSERT INTO t1 VALUES (0x00),(0x01),(0x02),(0x03),(0x04),(0x05),(0x06),(0x07);

INSERT INTO t1 VALUES (0x08),(0x09),(0x0A),(0x0B),(0x0C),(0x0D),(0x0E),(0x0F);

INSERT INTO t1 VALUES (0x10),(0x11),(0x12),(0x13),(0x14),(0x15),(0x16),(0x17);

INSERT INTO t1 VALUES (0x18),(0x19),(0x1A),(0x1B),(0x1C),(0x1D),(0x1E),(0x1F);

INSERT INTO t1 VALUES (0x20),(0x21),(0x22),(0x23),(0x24),(0x25),(0x26),(0x27);

INSERT INTO t1 VALUES (0x28),(0x29),(0x2A),(0x2B),(0x2C),(0x2D),(0x2E),(0x2F);

INSERT INTO t1 VALUES (0x30),(0x31),(0x32),(0x33),(0x34),(0x35),(0x36),(0x37);
@@ -45,3 +41,10 @@ INSERT INTO t1 VALUES (0xF8),(0xF9),(0xFA),(0xFB),(0xFC),(0xFD),(0xFE),(0xFF); 
#

SELECT hex(a) ha, hex(lower(a)) hl, hex(upper(a)) hu, 

a, lower(a) l, upper(a) u from t1 order by ha;





#

# Bug#6505 wrong sorting order

#

SELECT group_concat(a collate latin2_croatian_ci order by binary a) from t1 group by a collate latin2_croatian_ci;

drop table t1;