Commit 12dbb188 authored by unknown's avatar unknown
Browse files

Merge eel.(none):/home/jonas/src/mysql-5.0 

into  eel.(none):/home/jonas/src/mysql-5.1-push


sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
  Auto merged
storage/ndb/test/include/NDBT_Test.hpp:
  Auto merged
storage/ndb/test/ndbapi/Makefile.am:
  Auto merged
storage/ndb/test/ndbapi/bank/Bank.cpp:
  Auto merged
storage/ndb/test/ndbapi/bank/Bank.hpp:
  Auto merged
storage/ndb/test/src/NDBT_Test.cpp:
  Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
  Auto merged
parents e371b264 394d180b

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -859,6 +859,7 @@ ndb/test/ndbapi/testNodeRestart 
ndb/test/ndbapi/testOIBasic

ndb/test/ndbapi/testOperations

ndb/test/ndbapi/testRestartGci

ndb/test/ndbapi/testSRBank

ndb/test/ndbapi/testScan

ndb/test/ndbapi/testScan.dsp

ndb/test/ndbapi/testScanInterpreter

mysql-test/r/func_gconcat.result

+9 −0
Original line number Diff line number Diff line
@@ -469,6 +469,15 @@ select collation(group_concat(a,b)) from t1; 
ERROR HY000: Illegal mix of collations (cp1250_general_ci,IMPLICIT) and (koi8r_general_ci,IMPLICIT) for operation 'group_concat'

drop table t1;

drop table t2;

CREATE TABLE t1 (a CHAR(10) CHARACTER SET cp850);

INSERT INTO t1 VALUES ('');

SELECT a FROM t1;

a



SELECT GROUP_CONCAT(a) FROM t1;

GROUP_CONCAT(a)



DROP TABLE t1;

CREATE TABLE t1 (id int);

SELECT GROUP_CONCAT(id) AS gc FROM t1 HAVING gc IS NULL;

gc

mysql-test/r/information_schema.result

+11 −0
Original line number Diff line number Diff line
@@ -979,3 +979,14 @@ WHERE TABLE_SCHEMA='test' AND TABLE_TYPE='BASE TABLE'); 
Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	MyISAM	10	Fixed	0	0	0	#	1024	0	NULL	#	#	NULL	latin1_swedish_ci	NULL		

t2	MyISAM	10	Fixed	0	0	0	#	1024	0	NULL	#	#	NULL	latin1_swedish_ci	NULL		

DROP TABLE t1,t2;

create table t1(f1 int);

create view v1 (c) as select f1 from t1;

select database();

database()

NULL

show fields from test.v1;

Field	Type	Null	Key	Default	Extra

c	int(11)	YES		NULL	

drop view v1;

drop table t1;

mysql-test/r/variables.result

+7 −0
Original line number Diff line number Diff line
@@ -545,3 +545,10 @@ select @@max_heap_table_size > 0; 
select @@have_innodb;

@@have_innodb

#

select @@character_set_system;

@@character_set_system

utf8

set global character_set_system = latin1;

ERROR HY000: Variable 'character_set_system' is a read only variable

set @@global.version_compile_os='234';

ERROR HY000: Variable 'version_compile_os' is a read only variable

mysql-test/t/func_gconcat.test

+10 −0
Original line number Diff line number Diff line
@@ -281,6 +281,16 @@ select collation(group_concat(a,b)) from t1; 
drop table t1;

drop table t2;



#

# Bug #12829

# Cannot convert the charset of a GROUP_CONCAT result

#

CREATE TABLE t1 (a CHAR(10) CHARACTER SET cp850);

INSERT INTO t1 VALUES ('');

SELECT a FROM t1;

SELECT GROUP_CONCAT(a) FROM t1;

DROP TABLE t1;



#

# bug #7769: group_concat returning null is checked in having

#