database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

Fix for post-merge build failure.

Browse Source
This commit is contained in:
Nirbhay Choubey
2017-01-13 13:57:17 -05:00
parent ee8b5c305a
commit 5fc1ba604e
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
storage/xtradb/handler/ha_innodb.cc
View File

@@ -7340,16 +7340,7 @@ wsrep_store_key_val_for_row(
blob_data = row_mysql_read_blob_ref(&blob_len, blob_data = row_mysql_read_blob_ref(&blob_len,
(byte*) (record (byte*) (record
+ (ulint) get_field_offset(table, field)), + (ulint) get_field_offset(table, field)),
(ulint) field->pack_length(), (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
true_len = blob_len; true_len = blob_len;
@@ -9103,9 +9094,7 @@ wsrep_calc_row_hash(
switch (col_type) { switch (col_type) {
case DATA_BLOB: case DATA_BLOB:
ptr = row_mysql_read_blob_ref(&len, ptr, len, ptr = row_mysql_read_blob_ref(&len, ptr, len);
false, 0, 0, prebuilt);
break; break;
case DATA_VARCHAR: case DATA_VARCHAR: