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

Merge between local changes bb-10.2-mariarocks and the merge from upstream

Browse Source
This commit is contained in:
Sergei Petrunia
2017-02-20 13:01:32 +00:00
parent 5e47d08eb6 7facbc548d
commit 7d00f0981e
40 changed files with 822 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
storage/rocksdb/rdb_datadic.cc
View File

@@ -1425,7 +1425,7 @@ static void rdb_pack_with_varchar_encoding(
// pad with zeros if necessary;
for (size_t idx = 0; idx < padding_bytes; idx++)
*(ptr++) = 0;
*(ptr++) = 255 - padding_bytes;
*(ptr++) = 255 - (uchar)padding_bytes;
xfrm_len -= copy_len;
encoded_size += RDB_ESCAPE_LENGTH;
@@ -1686,7 +1686,7 @@ static int rdb_unpack_binary_or_utf8_varchar(
/* Save the length */
if (field_var->length_bytes == 1) {
d0[0] = len;
d0[0] = (uchar)len;
} else {
DBUG_ASSERT(field_var->length_bytes == 2);
int2store(d0, len);
@@ -1796,7 +1796,7 @@ static int rdb_unpack_binary_or_utf8_varchar_space_pad(
/* Save the length */
if (field_var->length_bytes == 1) {
d0[0] = len;
d0[0] = (uchar)len;
} else {
DBUG_ASSERT(field_var->length_bytes == 2);
int2store(d0, len);
@@ -2055,7 +2055,7 @@ int rdb_unpack_simple_varchar_space_pad(Rdb_field_packing *const fpi,
/* Save the length */
if (field_var->length_bytes == 1) {
d0[0] = len;
d0[0] = (uchar)len;
} else {
DBUG_ASSERT(field_var->length_bytes == 2);
int2store(d0, len);
@@ -3415,7 +3415,7 @@ Rdb_binlog_manager::pack_value(uchar *const buf, const char *const binlog_name,
// store binlog file name length
DBUG_ASSERT(strlen(binlog_name) <= FN_REFLEN);
const uint16_t binlog_name_len = strlen(binlog_name);
const uint16_t binlog_name_len = (uint16_t)strlen(binlog_name);
rdb_netbuf_store_uint16(buf + pack_len, binlog_name_len);
pack_len += sizeof(uint16);
@@ -3429,7 +3429,7 @@ Rdb_binlog_manager::pack_value(uchar *const buf, const char *const binlog_name,
// store binlog gtid length.
// If gtid was not set, store 0 instead
const uint16_t binlog_gtid_len = binlog_gtid ? strlen(binlog_gtid) : 0;
const uint16_t binlog_gtid_len = binlog_gtid ? (uint16_t)strlen(binlog_gtid) : 0;
rdb_netbuf_store_uint16(buf + pack_len, binlog_gtid_len);
pack_len += sizeof(uint16);