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
018df177
Commit
018df177
authored
17 years ago
by
istruewing@chilla.local
Browse files
Options
Browse Files
Download
Plain Diff
Merge chilla.local:/home/mydev/mysql-5.0-amain
into chilla.local:/home/mydev/mysql-5.0-axmrg
parents
9f234274
4bdd8cae
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
46 additions
and
1 deletion
+46
-1
mysql-test/r/archive-big.result
mysql-test/r/archive-big.result
+19
-0
mysql-test/t/archive-big.test
mysql-test/t/archive-big.test
+25
-0
sql/ha_archive.cc
sql/ha_archive.cc
+2
-1
No files found.
mysql-test/r/archive-big.result
0 → 100644
View file @
018df177
CREATE TABLE t1(a BLOB) ENGINE=ARCHIVE;
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;
DROP TABLE t1;
This diff is collapsed.
Click to expand it.
mysql-test/t/archive-big.test
0 → 100644
View file @
018df177
This diff is collapsed.
Click to expand it.
sql/ha_archive.cc
View file @
018df177
...
...
@@ -205,7 +205,7 @@ bool archive_db_init()
else
{
zoffset_size
=
2
<<
((
zlibCompileFlags
()
>>
6
)
&
3
);
switch
(
sizeof
(
z_off_t
)
)
{
switch
(
zoffset_size
)
{
case
2
:
max_zfile_size
=
INT_MAX16
;
break
;
...
...
@@ -676,6 +676,7 @@ int ha_archive::real_write_row(byte *buf, gzFile writer)
total_row_length
+=
((
Field_blob
*
)
table
->
field
[
*
ptr
])
->
get_length
();
if
(
share
->
approx_file_size
>
max_zfile_size
-
total_row_length
)
{
gzflush
(
writer
,
Z_SYNC_FLUSH
);
info
(
HA_STATUS_TIME
);
share
->
approx_file_size
=
(
ulong
)
data_file_length
;
if
(
share
->
approx_file_size
>
max_zfile_size
-
total_row_length
)
...
...
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