mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint

Browse source 
into  amd64.(none):/src/bug27029/my51-bug27029


storage/myisam/sort.c:
  Auto merged
This commit is contained in:
unknown 2007-06-21 12:53:03 -04:00
commit 772d158ee2
4 changed files with 100 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
mysql-test/suite/large_tests/README.TXT Normal file
View file

@ -0,0 +1,13 @@
large_test suite
================
Iggy Galarza 07/20/07
---------------------
This test suite should include any test that requires:
1. Longer than the default timeout to complete.
2. A considerable amount of disk space.
These tests can be completed with the following command:
mysql-test-run.pl --suite=large_tests --big-test --suite-timeout=6360 --testcase-timeout=795

37
mysql-test/suite/large_tests/r/alter_table.result Normal file
View file

@ -0,0 +1,37 @@
drop table if exists t1;
create table `t1` (`c1` tinyint unsigned not null, key `c1` (`c1`))
engine=myisam default charset=utf8;
alter table `t1` disable keys;
insert into t1 values (1),(2),(3),(4);
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1 limit 2147483647;
alter table t1 enable keys;
drop table t1;

47
mysql-test/suite/large_tests/t/alter_table.test Normal file
View file

@ -0,0 +1,47 @@
# The test for bug#27029 requires about 8 hours and 20 minutes on my
# fastest machine. This test requires at least 60 GB of disk space.
--source include/big_test.inc
#
# Bug#27029 alter table ... enable keys crashes mysqld on large table
#
--disable_warnings
drop table if exists t1;
--enable_warnings
create table `t1` (`c1` tinyint unsigned not null, key `c1` (`c1`))
engine=myisam default charset=utf8;
alter table `t1` disable keys;
insert into t1 values (1),(2),(3),(4);
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1 limit 2147483647; #Insert 4294967295 rows.
alter table t1 enable keys;
drop table t1;

5
storage/myisam/sort.c
View file

@ -138,8 +138,9 @@ int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages,
while (memavl >= MIN_SORT_MEMORY)
{
if ((my_off_t) (records+1)*(sort_length+sizeof(char*)) <=
(my_off_t) memavl)
if ((records < UINT_MAX32) &&
((my_off_t) (records + 1) *
(sort_length + sizeof(char*)) <= (my_off_t) memavl))
keys= records+1;
else
do