Commit 7f00fb60 authored Apr 30, 2008 by tsmith@ramayana.hindu.god

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build

into  ramayana.hindu.god:/home/tsmith/m/bk/build/51

parents a7e7fbd3 2c71b09c

mysql-test/r/group_concat_max_len_func.result

+1 −1

Original line number	Diff line number	Diff line
		@@ -76,4 +76,4 @@ id rollno group_concat(name)
		## Dropping table t1 ##
		DROP table t1;
		## Disconnecting both the connection ##
		SET @@group_concat_max_len = @save;
		SET @@global.group_concat_max_len = @save;

mysql-test/t/disabled.def

+2 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ ps_ddl : Bug#12093 2007-12-14 pending WL#4165 / WL#4166
		csv_alter_table : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables
		event_scheduler_basic: BUG#35997 server seems to crash.
		event_scheduler_func: BUG#35997 server seems to crash.
		thread_cache_size_func: BUG#35988 Due to not deterministic results
		query_cache_wlock_invalidate_func: Bug#35390 causes not deterministic results.
		thread_cache_size_func: BUG#35988 Due to not deterministic results
		user_limits : Bug#23921 random failure of user_limits.test

mysql-test/t/group_concat_max_len_func.test

+1 −1

Original line number	Diff line number	Diff line
		@@ -127,5 +127,5 @@ DISCONNECT test_con1;

		connection default;

		SET @@group_concat_max_len = @save;
		SET @@global.group_concat_max_len = @save;