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
f560252b
Commit
f560252b
authored
18 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into zim.tangent.org:/home/brian/mysql/cleanup-5.1
parents
1431fe7e
8b3850df
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
mysql-test/t/disabled.def
mysql-test/t/disabled.def
+0
-1
sql/ha_archive.cc
sql/ha_archive.cc
+8
-2
No files found.
mysql-test/t/disabled.def
View file @
f560252b
...
@@ -10,7 +10,6 @@
...
@@ -10,7 +10,6 @@
#
#
##############################################################################
##############################################################################
archive : Change between azio and gzio is causing an issue
events : Test case instability - infinite locking. To be fixed.
events : Test case instability - infinite locking. To be fixed.
func_group : Bug#15448
func_group : Bug#15448
func_math : Bug#15448
func_math : Bug#15448
...
...
This diff is collapsed.
Click to expand it.
sql/ha_archive.cc
View file @
f560252b
...
@@ -1237,10 +1237,16 @@ int ha_archive::optimize(THD* thd, HA_CHECK_OPT* check_opt)
...
@@ -1237,10 +1237,16 @@ int ha_archive::optimize(THD* thd, HA_CHECK_OPT* check_opt)
azwrite
(
&
writer
,
block
,
read
);
azwrite
(
&
writer
,
block
,
read
);
}
}
az
flush
(
&
writer
,
Z_SYNC_FLUSH
);
az
close
(
&
writer
);
share
->
dirty
=
FALSE
;
share
->
dirty
=
FALSE
;
azclose
(
&
(
share
->
archive_write
));
azclose
(
&
(
share
->
archive_write
));
share
->
archive_write
=
writer
;
if
(
!
(
azopen
(
&
(
share
->
archive_write
),
share
->
data_file_name
,
O_WRONLY
|
O_APPEND
|
O_BINARY
)))
{
DBUG_PRINT
(
"info"
,
(
"Could not open archive write file"
));
rc
=
HA_ERR_CRASHED_ON_USAGE
;
goto
error
;
}
my_rename
(
writer_filename
,
share
->
data_file_name
,
MYF
(
0
));
my_rename
(
writer_filename
,
share
->
data_file_name
,
MYF
(
0
));
...
...
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