bk commit into 5.0 tree (gluh:1.1810) BUG#8790

[gluh]

Below is the list of changes that have just been committed into a local
5.0 repository of gluh. When gluh 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.1810 05/03/15 20:54:44 gluh@stripped +4 -0
  Fix for bug #8790:Test 'information_schema': 'Max_data_length' shows 10 * (2 giga - 1) + 9

  mysql-test/t/view.test
    1.62 05/03/15 20:54:39 gluh@stripped +1 -2
    Fix for bug #8790:Test 'information_schema': 'Max_data_length' shows 10 * (2 giga - 1) + 9

  mysql-test/t/information_schema.test
    1.28 05/03/15 20:54:39 gluh@stripped +1 -2
    Fix for bug #8790:Test 'information_schema': 'Max_data_length' shows 10 * (2 giga - 1) + 9

  mysql-test/r/view.result
    1.69 05/03/15 20:54:39 gluh@stripped +2 -2
    Fix for bug #8790:Test 'information_schema': 'Max_data_length' shows 10 * (2 giga - 1) + 9

  mysql-test/r/information_schema.result
    1.39 05/03/15 20:54:39 gluh@stripped +3 -3
    Fix for bug #8790:Test 'information_schema': 'Max_data_length' shows 10 * (2 giga - 1) + 9

# 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:	gluh
# Host:	gluh.mysql.r18.ru
# Root:	/home/gluh/MySQL-MERGE/mysql-5.0

--- 1.68/mysql-test/r/view.result	Tue Feb 22 13:43:39 2005
+++ 1.69/mysql-test/r/view.result	Tue Mar 15 20:54:39 2005
@@ -1115,8 +1115,8 @@
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s)
 show table status;
 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	9	Fixed	0	0	0	21474836479	1024	0	NULL	#	#	NULL	latin1_swedish_ci	NULL		
-v1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	#	#	NULL	NULL	NULL	NULL	View 'test.v1' references invalid table(s) or column(s) or function(s)
+t1	MyISAM	9	Fixed	0	0	0	#	1024	0	NULL	#	#	NULL	latin1_swedish_ci	NULL		
+v1	NULL	NULL	NULL	NULL	NULL	NULL	#	NULL	NULL	NULL	#	#	NULL	NULL	NULL	NULL	View 'test.v1' references invalid table(s) or column(s) or function(s)
 drop view v1;
 drop table t1;
 create view v1 as select 99999999999999999999999999999999999999999999999999999 as col1;

--- 1.61/mysql-test/t/view.test	Tue Feb 22 13:26:58 2005
+++ 1.62/mysql-test/t/view.test	Tue Mar 15 20:54:39 2005
@@ -1117,8 +1117,7 @@
 drop function x1;
 -- error 1356
 select * from v1;
---replace_column 12 # 13 #
---replace_result "2147483647	" "21474836479	"
+--replace_column 8 # 12 # 13 #
 show table status;
 drop view v1;
 drop table t1;

--- 1.38/mysql-test/r/information_schema.result	Sat Mar 12 02:05:59 2005
+++ 1.39/mysql-test/r/information_schema.result	Tue Mar 15 20:54:39 2005
@@ -118,9 +118,9 @@
 t3
 show table status;
 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	9	Fixed	0	0	0	21474836479	1024	0	NULL	#	#	NULL	latin1_swedish_ci	NULL		
-t3	MyISAM	9	Fixed	0	0	0	21474836479	1024	0	NULL	#	#	NULL	latin1_swedish_ci	NULL		
-v1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	#	#	NULL	NULL	NULL	NULL	view
+t2	MyISAM	9	Fixed	0	0	0	#	1024	0	NULL	#	#	NULL	latin1_swedish_ci	NULL		
+t3	MyISAM	9	Fixed	0	0	0	#	1024	0	NULL	#	#	NULL	latin1_swedish_ci	NULL		
+v1	NULL	NULL	NULL	NULL	NULL	NULL	#	NULL	NULL	NULL	#	#	NULL	NULL	NULL	NULL	view
 show full columns from t3 like "a%";
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
 a	int(11)	NULL	YES	MUL	NULL		select,insert,update,references	

--- 1.27/mysql-test/t/information_schema.test	Sat Mar  5 14:34:18 2005
+++ 1.28/mysql-test/t/information_schema.test	Tue Mar 15 20:54:39 2005
@@ -37,8 +37,7 @@
 show keys from t3 where Key_name = "a_data";
 
 show tables like 't%';
---replace_column 12 # 13 #
---replace_result "2147483647	" "21474836479	"
+--replace_column 8 # 12 # 13 #
 show table status;
 show full columns from t3 like "a%";
 show full columns from mysql.db like "Insert%";