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

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

into mysql.com:/M50/mysql-5.0
parents a9c295f3 946adafd

mysql-test/mysql-test-run.sh

+3 −1
Original line number Diff line number Diff line
@@ -631,7 +631,9 @@ fi 
[ -d $MYSQL_TEST_DIR/var/tmp ] || mkdir $MYSQL_TEST_DIR/var/tmp

[ -d $MYSQL_TEST_DIR/var/run ] || mkdir $MYSQL_TEST_DIR/var/run

[ -d $MYSQL_TEST_DIR/var/log ] || mkdir $MYSQL_TEST_DIR/var/log

if ! test -L $MYSQL_TEST_DIR/var/std_data_ln ; then



# Use 'test', not '[' as the shell builtin might not have '-L

if test ! -L "$MYSQL_TEST_DIR/var/std_data_ln" ; then

  ln -s $MYSQL_TEST_DIR/std_data/ $MYSQL_TEST_DIR/var/std_data_ln

fi

mysql-test/r/func_gconcat.result

+0 −10
Original line number Diff line number Diff line
@@ -611,16 +611,6 @@ count(distinct (f1+1)) 
1

3

drop table t1;

create table t1 (f1 int unsigned, f2 varchar(255));

insert into t1 values (1,repeat('a',255)),(2,repeat('b',255));

select f2,group_concat(f1) from t1 group by f2;

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def	test	t1	t1	f2	f2	253	255	255	Y	0	0	8

def					group_concat(f1)	253	400	1	Y	128	0	63

f2	group_concat(f1)

aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa	1

bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb	2

drop table t1;

set names latin1;

create table t1 (a char, b char);

insert into t1 values ('a', 'a'), ('a', 'b'), ('b', 'a'), ('b', 'b');

mysql-test/r/ndb_bitfield.result

+2 −2
Original line number Diff line number Diff line
@@ -201,13 +201,13 @@ create table t1 ( 
pk1 bit(9) not null primary key,

b int

) engine=ndbcluster;

ERROR HY000: Can't create table './test/t1.frm' (errno: 739)

ERROR HY000: Can't create table './test/t1.frm' (errno: 906)

create table t1 (

pk1 int not null primary key,

b bit(9),

key(b)

) engine=ndbcluster;

ERROR HY000: Can't create table './test/t1.frm' (errno: 743)

ERROR HY000: Can't create table './test/t1.frm' (errno: 906)

create table t1 (

pk1 int primary key,

b bit(32) not null

mysql-test/r/rpl_deadlock.result

+99 −6
Original line number Diff line number Diff line
@@ -44,8 +44,39 @@ select * from t2; 
a

22

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	18911	#	#	master-bin.000001	Yes	Yes							0		0	18911	#	None		0	No						#

Slave_IO_State	#

Master_Host	127.0.0.1

Master_User	root

Master_Port	MASTER_MYPORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	18911

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	Yes

Slave_SQL_Running	Yes

Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	18911

Relay_Log_Space	#

Until_Condition	None

Until_Log_File	

Until_Log_Pos	0

Master_SSL_Allowed	No

Master_SSL_CA_File	

Master_SSL_CA_Path	

Master_SSL_Cert	

Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

stop slave;

change master to master_log_pos=532;

begin;
@@ -62,8 +93,39 @@ select * from t2; 
a

22

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	18911	#	#	master-bin.000001	Yes	Yes							0		0	18911	#	None		0	No						#

Slave_IO_State	#

Master_Host	127.0.0.1

Master_User	root

Master_Port	MASTER_MYPORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	18911

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	#

Slave_SQL_Running	Yes

Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	18911

Relay_Log_Space	#

Until_Condition	None

Until_Log_File	

Until_Log_Pos	0

Master_SSL_Allowed	No

Master_SSL_CA_File	

Master_SSL_CA_Path	

Master_SSL_Cert	

Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

set global max_relay_log_size=0;

stop slave;

change master to master_log_pos=532;
@@ -82,6 +144,37 @@ select * from t2; 
a

22

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	18911	#	#	master-bin.000001	#	Yes							0		0	18911	#	None		0	No						#

Slave_IO_State	#

Master_Host	127.0.0.1

Master_User	root

Master_Port	MASTER_MYPORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	18911

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	#

Slave_SQL_Running	Yes

Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	18911

Relay_Log_Space	#

Until_Condition	None

Until_Log_File	

Until_Log_Pos	0

Master_SSL_Allowed	No

Master_SSL_CA_File	

Master_SSL_CA_Path	

Master_SSL_Cert	

Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

drop table t1,t2,t3,t4;

mysql-test/t/func_gconcat.test

+0 −11
Original line number Diff line number Diff line
@@ -398,17 +398,6 @@ select f1, group_concat(f1+1) from t1 group by f1 with rollup; 
select count(distinct (f1+1)) from t1 group by f1 with rollup;

drop table t1;



#

# Bug#14169 type of group_concat() result changed to blob if tmp_table was used

#

create table t1 (f1 int unsigned, f2 varchar(255));

insert into t1 values (1,repeat('a',255)),(2,repeat('b',255));

--enable_metadata

select f2,group_concat(f1) from t1 group by f2;

# select f2,group_concat(f1) from t1 group by f2 order by 2;

--disable_metadata

drop table t1;



# End of 4.1 tests



#