From 48e10134927e1bdb963cb00d82b006b5e28d5d96 Mon Sep 17 00:00:00 2001
From: "ramil@mysql.com" <>
Date: Fri, 8 Jul 2005 16:25:07 +0500
Subject: [PATCH 1/2] portability fix: the Max_data_length replaced with #

---
 mysql-test/r/view.result | 14 +++++++-------
 mysql-test/t/view.test   |  3 +--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index cebf88464cf..c0ed41bb8e6 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -149,13 +149,13 @@ v5	VIEW
 v6	VIEW
 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	10	Fixed	5	9	45	2533274790395903	1024	0	NULL	#	#	NULL	latin1_swedish_ci	NULL		
-v1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	#	#	NULL	NULL	NULL	NULL	view
-v2	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	#	#	NULL	NULL	NULL	NULL	view
-v3	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	#	#	NULL	NULL	NULL	NULL	view
-v4	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	#	#	NULL	NULL	NULL	NULL	view
-v5	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	#	#	NULL	NULL	NULL	NULL	view
-v6	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	#	#	NULL	NULL	NULL	NULL	view
+t1	MyISAM	10	Fixed	5	9	45	#	1024	0	NULL	#	#	NULL	latin1_swedish_ci	NULL		
+v1	NULL	NULL	NULL	NULL	NULL	NULL	#	NULL	NULL	NULL	#	#	NULL	NULL	NULL	NULL	view
+v2	NULL	NULL	NULL	NULL	NULL	NULL	#	NULL	NULL	NULL	#	#	NULL	NULL	NULL	NULL	view
+v3	NULL	NULL	NULL	NULL	NULL	NULL	#	NULL	NULL	NULL	#	#	NULL	NULL	NULL	NULL	view
+v4	NULL	NULL	NULL	NULL	NULL	NULL	#	NULL	NULL	NULL	#	#	NULL	NULL	NULL	NULL	view
+v5	NULL	NULL	NULL	NULL	NULL	NULL	#	NULL	NULL	NULL	#	#	NULL	NULL	NULL	NULL	view
+v6	NULL	NULL	NULL	NULL	NULL	NULL	#	NULL	NULL	NULL	#	#	NULL	NULL	NULL	NULL	view
 drop view v1,v2,v3,v4,v5,v6;
 create view v1 (c,d,e,f) as select a,b,
 a in (select a+2 from t1), a = all (select a from t1) from t1;
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
index f3e32754821..81ac644a80b 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@@ -83,8 +83,7 @@ explain extended select c from v6;
 # show table/table status test
 show tables;
 show full tables;
---replace_column 12 # 13 #
---replace_result 2147483647 38654705663
+--replace_column 8 # 12 # 13 #
 show table status;
 
 drop view v1,v2,v3,v4,v5,v6;

From 8295cec7bc779818b7c5639ce3365391574d75db Mon Sep 17 00:00:00 2001
From: "kent@mysql.com" <>
Date: Fri, 8 Jul 2005 14:59:02 +0200
Subject: [PATCH 2/2] sql_insert.cc:   Use the test() macro instead of
 assigning a pointer to a bool

---
 sql/sql_insert.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 576866cb17d..2060d6ade81 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -1118,7 +1118,7 @@ int check_that_all_fields_are_given_values(THD *thd, TABLE *entry,
         table_list= (table_list->belong_to_view ?
                      table_list->belong_to_view :
                      table_list);
-        view= (table_list->view);
+        view= test(table_list->view);
       }
       if (view)
       {