bk commit into 5.0 tree (ramil:1.1903) BUG#11809

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1903 05/07/08 12:54:00 ramil@stripped +2 -0
  a fix (bug #11809: ps_1general.test fails on QNX).

  mysql-test/t/ps_1general.test
    1.24 05/07/08 12:53:51 ramil@stripped +2 -4
    a fix (bug #11809: ps_1general.test fails on QNX).
    replace Max_data_length column value with '#' as well

  mysql-test/r/ps_1general.result
    1.43 05/07/08 12:53:51 ramil@stripped +2 -2
    a fix (bug #11809: ps_1general.test fails on QNX).
    replace Max_data_length column value with '#' as well

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ramil
# Host:	gw.mysql.r18.ru
# Root:	/usr/home/ram/work/mysql-5.0-release

--- 1.42/mysql-test/r/ps_1general.result	2005-06-20 15:08:54 +05:00
+++ 1.43/mysql-test/r/ps_1general.result	2005-07-08 12:53:51 +05:00
@@ -290,11 +290,11 @@
 prepare stmt4 from ' show table status from test like ''t2%'' ';
 execute stmt4;
 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
-t2	MyISAM	10	Fixed	0	0	0	4222124650659839	1024	0	NULL	#	#	#	latin1_swedish_ci	NULL		
+t2	MyISAM	10	Fixed	0	0	0	#	1024	0	NULL	#	#	#	latin1_swedish_ci	NULL		
 prepare stmt4 from ' show table status from test like ''t9%'' ';
 execute stmt4;
 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
-t9	MyISAM	10	Dynamic	2	216	432	281474976710655	2048	0	NULL	#	#	#	latin1_swedish_ci	NULL		
+t9	MyISAM	10	Dynamic	2	216	432	#	2048	0	NULL	#	#	#	latin1_swedish_ci	NULL		
 prepare stmt4 from ' show status like ''Threads_running'' ';
 execute stmt4;
 Variable_name	Value

--- 1.23/mysql-test/t/ps_1general.test	2005-05-13 14:08:03 +05:00
+++ 1.24/mysql-test/t/ps_1general.test	2005-07-08 12:53:51 +05:00
@@ -307,15 +307,13 @@
 execute stmt4;
 prepare stmt4 from ' show table status from test like ''t2%'' ';
 # egalize date and time values
---replace_column 12 # 13 # 14 #
---replace_result 2147483647 64424509439
+--replace_column 8 # 12 # 13 # 14 #
 # Bug#4288 : prepared statement 'show table status ..', wrong output on execute
 execute stmt4;
 # try the same with the big table
 prepare stmt4 from ' show table status from test like ''t9%'' ';
 # egalize date and time values
---replace_column 12 # 13 # 14 #
---replace_result 2147483647 4294967295
+--replace_column 8 # 12 # 13 # 14 #
 # Bug#4288
 execute stmt4;
 prepare stmt4 from ' show status like ''Threads_running'' ';