Merge bk@192.168.21.1:mysql-4.1

into  mysql.com:/home/hf/work/mysql-4.1.20317

mysql-test/r/ps_1general.result

@@ -282,7 +282,7 @@ t9	MyISAM	9	Dynamic	2	220	440	4294967295	2048	0	NULL	#	#	#	latin1_swedish_ci	NUL
 prepare stmt4 from ' show status like ''Threads_running'' ';
 execute stmt4;
 Variable_name	Value
-Threads_running	1
+Threads_running	#
 prepare stmt4 from ' show variables like ''sql_mode'' ';
 execute stmt4;
 Variable_name	Value

mysql-test/t/ps_1general.test

@@ -305,6 +305,7 @@ prepare stmt4 from ' show table status from test like ''t9%'' ';
 --replace_result 2147483647 4294967295
 # Bug#4288
 execute stmt4;
+--replace_column 2 #
 prepare stmt4 from ' show status like ''Threads_running'' ';
 execute stmt4;
 prepare stmt4 from ' show variables like ''sql_mode'' ';