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
5fc1ba60
Commit
5fc1ba60
authored
Jan 13, 2017
by
Nirbhay Choubey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for post-merge build failure.
parent
ee8b5c30
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
13 deletions
+2
-13
storage/xtradb/handler/ha_innodb.cc
storage/xtradb/handler/ha_innodb.cc
+2
-13
No files found.
storage/xtradb/handler/ha_innodb.cc
View file @
5fc1ba60
...
...
@@ -7340,16 +7340,7 @@ wsrep_store_key_val_for_row(
blob_data
=
row_mysql_read_blob_ref
(
&
blob_len
,
(
byte
*
)
(
record
+
(
ulint
)
get_field_offset
(
table
,
field
)),
(
ulint
)
field
->
pack_length
(),
#ifdef HAVE_PERCONA_COMPRESSED_COLUMNS
field
->
column_format
()
==
COLUMN_FORMAT_TYPE_COMPRESSED
,
reinterpret_cast
<
const
byte
*>
(
field
->
zip_dict_data
.
str
),
field
->
zip_dict_data
.
length
,
prebuilt
);
#else
0
,
0
,
0
,
prebuilt
);
#endif
(
ulint
)
field
->
pack_length
());
true_len
=
blob_len
;
...
...
@@ -9103,9 +9094,7 @@ wsrep_calc_row_hash(
switch
(
col_type
)
{
case
DATA_BLOB
:
ptr
=
row_mysql_read_blob_ref
(
&
len
,
ptr
,
len
,
false
,
0
,
0
,
prebuilt
);
ptr
=
row_mysql_read_blob_ref
(
&
len
,
ptr
,
len
);
break
;
case
DATA_VARCHAR
:
...
...
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