diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-01-13 13:57:17 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-01-13 13:57:17 -0500 |
| commit | 5fc1ba604e27b7d9eaa2977ef5b0c180f6f62565 (patch) | |
| tree | b224db796dbc37bd4e615a455c43754fd4b11875 | |
| parent | ee8b5c305a2334d06fe999b2db441d0436f9f423 (diff) | |
| download | mariadb-git-5fc1ba604e27b7d9eaa2977ef5b0c180f6f62565.tar.gz | |
Fix for post-merge build failure.mariadb-galera-10.0.29
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.cc | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index ea6a08fc156..ea94f90cbf8 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -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: |