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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
6ed1f88b
Commit
6ed1f88b
authored
14 years ago
by
Michael Widenius
Browse files
Options
Browse Files
Download
Plain Diff
merge with 5.1-release
parents
bc33433f
420b6312
Branches unavailable
Tags unavailable
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
14 deletions
+7
-14
mysql-test/suite/pbxt/r/select.result
mysql-test/suite/pbxt/r/select.result
+1
-3
mysql-test/suite/pbxt/t/select.test
mysql-test/suite/pbxt/t/select.test
+2
-1
storage/maria/ma_loghandler.c
storage/maria/ma_loghandler.c
+0
-8
storage/maria/maria_chk.c
storage/maria/maria_chk.c
+1
-1
storage/maria/maria_pack.c
storage/maria/maria_pack.c
+3
-1
No files found.
mysql-test/suite/pbxt/r/select.result
View file @
6ed1f88b
...
...
@@ -3447,9 +3447,7 @@ insert into t2 select A.a, B.a, C.a, C.a from t1 A, t1 B, t1 C;
analyze table t2;
Table Op Msg_type Msg_text
test.t2 analyze status OK
select 'In next EXPLAIN, B.rows must be exactly 10:' Z;
Z
In next EXPLAIN, B.rows must be exactly 10:
In next EXPLAIN, B.rows must be exactly 10 (when using MyISAM):
explain select * from t2 A, t2 B where A.a=5 and A.b=5 and A.C<5
and B.a=5 and B.b=A.e and (B.b =1 or B.b = 3 or B.b=5);
id select_type table type possible_keys key key_len ref rows Extra
...
...
This diff is collapsed.
Click to expand it.
mysql-test/suite/pbxt/t/select.test
View file @
6ed1f88b
...
...
@@ -2910,8 +2910,9 @@ insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
create
table
t2
(
a
int
,
b
int
,
c
int
,
e
int
,
primary
key
(
a
,
b
,
c
));
insert
into
t2
select
A
.
a
,
B
.
a
,
C
.
a
,
C
.
a
from
t1
A
,
t1
B
,
t1
C
;
analyze
table
t2
;
select
'In next EXPLAIN, B.rows must be exactly 10:'
Z
;
--
echo
In
next
EXPLAIN
,
B
.
rows
must
be
exactly
10
(
when
using
MyISAM
)
:
# We mask out the 'rows' column because it may differ from run to run
--
replace_column
9
#
explain
select
*
from
t2
A
,
t2
B
where
A
.
a
=
5
and
A
.
b
=
5
and
A
.
C
<
5
and
B
.
a
=
5
and
B
.
b
=
A
.
e
and
(
B
.
b
=
1
or
B
.
b
=
3
or
B
.
b
=
5
);
...
...
This diff is collapsed.
Click to expand it.
storage/maria/ma_loghandler.c
View file @
6ed1f88b
...
...
@@ -2537,14 +2537,6 @@ my_bool translog_prev_buffer_flush_wait(struct st_translog_buffer *buffer)
LSN_IN_PARTS
(
buffer
->
prev_sent_to_disk
),
LSN_IN_PARTS
(
buffer
->
prev_buffer_offset
)));
translog_buffer_lock_assert_owner
(
buffer
);
/*
if prev_sent_to_disk == LSN_IMPOSSIBLE then
prev_buffer_offset should be LSN_IMPOSSIBLE
because it means that this buffer was never used
*/
DBUG_ASSERT
((
buffer
->
prev_sent_to_disk
==
LSN_IMPOSSIBLE
&&
buffer
->
prev_buffer_offset
==
LSN_IMPOSSIBLE
)
||
buffer
->
prev_sent_to_disk
!=
LSN_IMPOSSIBLE
);
if
(
buffer
->
prev_buffer_offset
!=
buffer
->
prev_sent_to_disk
)
{
do
{
...
...
This diff is collapsed.
Click to expand it.
storage/maria/maria_chk.c
View file @
6ed1f88b
...
...
@@ -1339,12 +1339,12 @@ static int maria_chk(HA_CHECK *param, char *filename)
maria_lock_database
(
info
,
F_UNLCK
);
end2:
end_pagecache
(
maria_pagecache
,
1
);
if
(
maria_close
(
info
))
{
_ma_check_print_error
(
param
,
default_close_errmsg
,
my_errno
,
filename
);
DBUG_RETURN
(
1
);
}
end_pagecache
(
maria_pagecache
,
1
);
if
(
error
==
0
)
{
if
(
param
->
out_flag
&
O_NEW_DATA
)
...
...
This diff is collapsed.
Click to expand it.
storage/maria/maria_pack.c
View file @
6ed1f88b
...
...
@@ -690,6 +690,8 @@ static int compress(PACK_MRG_INFO *mrg,char *result_table)
error
|=
my_close
(
new_file
,
MYF
(
MY_WME
));
if
(
!
result_table
)
{
(
void
)
flush_pagecache_blocks
(
isam_file
->
s
->
pagecache
,
&
isam_file
->
dfile
,
FLUSH_RELEASE
);
error
|=
my_close
(
isam_file
->
dfile
.
file
,
MYF
(
MY_WME
));
isam_file
->
dfile
.
file
=
-
1
;
/* Tell maria_close file is closed */
isam_file
->
s
->
bitmap
.
file
.
file
=
-
1
;
...
...
@@ -763,13 +765,13 @@ static int compress(PACK_MRG_INFO *mrg,char *result_table)
DBUG_RETURN
(
0
);
err:
end_pagecache
(
maria_pagecache
,
1
);
free_counts_and_tree_and_queue
(
huff_trees
,
trees
,
huff_counts
,
fields
);
if
(
new_file
>=
0
)
VOID
(
my_close
(
new_file
,
MYF
(
0
)));
if
(
join_maria_file
>=
0
)
VOID
(
my_close
(
join_maria_file
,
MYF
(
0
)));
mrg_close
(
mrg
);
end_pagecache
(
maria_pagecache
,
1
);
VOID
(
fprintf
(
stderr
,
"Aborted: %s is not compressed
\n
"
,
org_name
));
DBUG_RETURN
(
-
1
);
}
...
...
This diff is collapsed.
Click to expand it.
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