diff options
| author | unknown <istruewing@chilla.local> | 2007-01-24 15:52:19 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-01-24 15:52:19 +0100 |
| commit | 6bb5fd6b28b6276eea5c9cb928af1f3192d93895 (patch) | |
| tree | 350d07d7233a05a56a784b5ad735dc34ece85a66 | |
| parent | 5e0fd916f1fa72cd2cc4126669ad1772a77e055d (diff) | |
| parent | ccb002dbc2ce72221716e31f9fccd10e26ecb941 (diff) | |
| download | mariadb-git-6bb5fd6b28b6276eea5c9cb928af1f3192d93895.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into chilla.local:/home/mydev/mysql-5.0-bug24607
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
| -rw-r--r-- | mysql-test/r/myisam.result | 4 | ||||
| -rw-r--r-- | 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 52dae8abd02..473cc8b206d 100644 --- a/mysql-test/r/myisam.result +++ b/mysql-test/r/myisam.result @@ -1624,8 +1624,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 10 Dynamic X X X 72057594037927935 X X X X X X latin1_swedish_ci X max_rows=4294967295 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; diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test index 3189a59333b..f2eca85e9ea 100644 --- a/mysql-test/t/myisam.test +++ b/mysql-test/t/myisam.test @@ -992,7 +992,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; |