Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
f0dbd310
Commit
f0dbd310
authored
Jun 22, 2007
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
parents
8ddf61d3
37344c68
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
104 additions
and
4 deletions
+104
-4
myisam/sort.c
myisam/sort.c
+3
-2
mysql-test/r/kill.result
mysql-test/r/kill.result
+1
-1
mysql-test/suite/large_tests/README.TXT
mysql-test/suite/large_tests/README.TXT
+13
-0
mysql-test/suite/large_tests/r/alter_table.result
mysql-test/suite/large_tests/r/alter_table.result
+37
-0
mysql-test/suite/large_tests/t/alter_table.test
mysql-test/suite/large_tests/t/alter_table.test
+47
-0
mysql-test/t/kill.test
mysql-test/t/kill.test
+3
-1
No files found.
myisam/sort.c
View file @
f0dbd310
...
...
@@ -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
...
...
mysql-test/r/kill.result
View file @
f0dbd310
...
...
@@ -22,7 +22,7 @@ create table t2 (id int unsigned not null);
insert into t2 select id from t1;
create table t3 (kill_id int);
insert into t3 values(connection_id());
select id from t1 where id in (select distinct
id from t2
);
select id from t1 where id in (select distinct
a.id from t2 a, t2 b, t2 c, t2 d group by a.id, b.id, c.id, d.id having a.id between 10 and 20
);
select ((@id := kill_id) - kill_id) from t3;
((@id := kill_id) - kill_id)
0
...
...
mysql-test/suite/large_tests/README.TXT
0 → 100644
View file @
f0dbd310
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
mysql-test/suite/large_tests/r/alter_table.result
0 → 100644
View file @
f0dbd310
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;
mysql-test/suite/large_tests/t/alter_table.test
0 → 100644
View file @
f0dbd310
# 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
;
mysql-test/t/kill.test
View file @
f0dbd310
...
...
@@ -81,7 +81,9 @@ connection conn2;
connection
conn1
;
--
disable_result_log
send
select
id
from
t1
where
id
in
(
select
distinct
id
from
t2
);
# This is a very long running query. If this test start failing, it may
# be necessary to change to an even longer query.
send
select
id
from
t1
where
id
in
(
select
distinct
a
.
id
from
t2
a
,
t2
b
,
t2
c
,
t2
d
group
by
a
.
id
,
b
.
id
,
c
.
id
,
d
.
id
having
a
.
id
between
10
and
20
);
--
enable_result_log
connection
conn2
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment