From 928d672c46f48444268bad63ba1377c8e2a3bc0d Mon Sep 17 00:00:00 2001
From: "istruewing@chilla.local" <>
Date: Wed, 24 Jan 2007 13:17:01 +0100
Subject: [PATCH 1/2] Bug#24607 - MyISAM pointer size determined incorrectly
 Fixed test. On 32-bit machines which compile without -DBIG_TABLES, MAX_ROWS
 is truncated to a 32-bit value. Using a value below 4G is portable.

---
 mysql-test/r/myisam.result | 4 ++--
 mysql-test/t/myisam.test   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
index 48d9905311d..41d2d48f82e 100644
--- a/mysql-test/r/myisam.result
+++ b/mysql-test/r/myisam.result
@@ -939,8 +939,8 @@ a
 2
 3
 DROP TABLE t1;
-CREATE TABLE t1 (c1 TEXT) AVG_ROW_LENGTH=70100 MAX_ROWS=5100100100;
+CREATE TABLE t1 (c1 TEXT) AVG_ROW_LENGTH=70100 MAX_ROWS=4100100100;
 SHOW TABLE STATUS LIKE 't1';
 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	Dynamic	X	X	X	72057594037927935	X	X	X	X	X	X	latin1_swedish_ci	X	max_rows=4294967295 avg_row_length=70100	
+t1	MyISAM	9	Dynamic	X	X	X	72057594037927935	X	X	X	X	X	X	latin1_swedish_ci	X	max_rows=4100100100 avg_row_length=70100	
 DROP TABLE t1;
diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test
index 0aeb49b0e99..0abe0a25f44 100644
--- a/mysql-test/t/myisam.test
+++ b/mysql-test/t/myisam.test
@@ -877,7 +877,7 @@ DROP TABLE t1;
 #
 # Bug#24607 - MyISAM pointer size determined incorrectly
 #
-CREATE TABLE t1 (c1 TEXT) AVG_ROW_LENGTH=70100 MAX_ROWS=5100100100;
+CREATE TABLE t1 (c1 TEXT) AVG_ROW_LENGTH=70100 MAX_ROWS=4100100100;
 --replace_column 5 X 6 X 7 X 9 X 10 X 11 X 12 X 13 X 14 X 16 X
 SHOW TABLE STATUS LIKE 't1';
 DROP TABLE t1;

From 23debf86623420841e8e481896351a4f8e48a4cc Mon Sep 17 00:00:00 2001
From: "istruewing@chilla.local" <>
Date: Wed, 24 Jan 2007 13:29:46 +0100
Subject: [PATCH 2/2] Bug#24607 - MyISAM pointer size determined incorrectly
 After merge fix

---
 mysql-test/r/myisam.result | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
index 6ffbabe3c61..373049bf051 100644
--- a/mysql-test/r/myisam.result
+++ b/mysql-test/r/myisam.result
@@ -1640,5 +1640,5 @@ DROP TABLE t1;
 CREATE TABLE t1 (c1 TEXT) AVG_ROW_LENGTH=70100 MAX_ROWS=4100100100;
 SHOW TABLE STATUS LIKE 't1';
 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	Dynamic	X	X	X	72057594037927935	X	X	X	X	X	X	latin1_swedish_ci	X	max_rows=4100100100 avg_row_length=70100	
+t1	MyISAM	10	Dynamic	X	X	X	72057594037927935	X	X	X	X	X	X	latin1_swedish_ci	X	max_rows=4100100100 avg_row_length=70100	
 DROP TABLE t1;