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
ff3f63c3
Commit
ff3f63c3
authored
10 years ago
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compiler errors caused by merge error.
parent
d12dbe77
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.cc
+2
-2
storage/xtradb/handler/ha_innodb.cc
storage/xtradb/handler/ha_innodb.cc
+2
-2
No files found.
storage/innobase/handler/ha_innodb.cc
View file @
ff3f63c3
...
...
@@ -16915,9 +16915,9 @@ static MYSQL_SYSVAR_LONG(compression_algorithm, innodb_compression_algorithm,
#if defined(HAVE_LZO) && defined(HAVE_LZ4)
PAGE_ALGORITHM_LAST
,
#elif defined(HAVE_LZ4) && !defined(HAVE_LZO)
PAGE_
ALGORITHM_LZ4
,
PAGE_
LZ4_ALGORITHM
,
#else
PAGE_
ALGORITHM_ZLIB
,
PAGE_
ZLIB_ALGORITHM
,
#endif
0
);
...
...
This diff is collapsed.
Click to expand it.
storage/xtradb/handler/ha_innodb.cc
View file @
ff3f63c3
...
...
@@ -18093,9 +18093,9 @@ static MYSQL_SYSVAR_LONG(compression_algorithm, innodb_compression_algorithm,
#if defined(HAVE_LZO) && defined(HAVE_LZ4)
PAGE_ALGORITHM_LAST
,
#elif defined(HAVE_LZ4) && !defined(HAVE_LZO)
PAGE_
ALGORITHM_LZ4
,
PAGE_
LZ4_ALGORITHM
,
#else
PAGE_
ALGORITHM_ZLIB
,
PAGE_
ZLIB_ALGORITHM
,
#endif
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