mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge -r4105..4106 from codership/5.6

Browse source
This commit is contained in:
Jan Lindström 2014-07-04 11:58:14 +03:00
parent 006cb2a6f9
commit 84b3ec1fa4
4 changed files with 14 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
storage/innobase/handler/ha_innodb.cc
View file

@ -6261,7 +6261,6 @@ wsrep_store_key_val_for_row(
const byte* data;
ulint key_len;
ulint true_len;
ulint sort_len;
const CHARSET_INFO* cs;
int error=0;
@ -6304,12 +6303,12 @@ wsrep_store_key_val_for_row(
}
memcpy(sorted, data, true_len);
sort_len = wsrep_innobase_mysql_sort(
true_len = wsrep_innobase_mysql_sort(
mysql_type, cs->number, sorted, true_len,
REC_VERSION_56_MAX_INDEX_COL_LEN);
if (wsrep_protocol_version > 1) {
memcpy(buff, sorted, sort_len);
memcpy(buff, sorted, true_len);
/* Note that we always reserve the maximum possible
length of the true VARCHAR in the key value, though
only len first bytes after the 2 length bytes contain
@ -6330,7 +6329,6 @@ wsrep_store_key_val_for_row(
const CHARSET_INFO* cs;
ulint key_len;
ulint true_len;
ulint sort_len;
int error=0;
ulint blob_len;
const byte* blob_data;
@ -6379,11 +6377,11 @@ wsrep_store_key_val_for_row(
}
memcpy(sorted, blob_data, true_len);
sort_len = wsrep_innobase_mysql_sort(
true_len = wsrep_innobase_mysql_sort(
mysql_type, cs->number, sorted, true_len,
REC_VERSION_56_MAX_INDEX_COL_LEN);
memcpy(buff, sorted, sort_len);
memcpy(buff, sorted, true_len);
/* Note that we always reserve the maximum possible
length of the BLOB prefix in the key value. */
@ -6400,7 +6398,6 @@ wsrep_store_key_val_for_row(
const CHARSET_INFO* cs = NULL;
ulint true_len;
ulint sort_len;
ulint key_len;
const uchar* src_start;
int error=0;
@ -6445,28 +6442,16 @@ wsrep_store_key_val_for_row(
&error);
}
memcpy(sorted, src_start, true_len);
sort_len = wsrep_innobase_mysql_sort(
true_len = wsrep_innobase_mysql_sort(
mysql_type, cs->number, sorted, true_len,
REC_VERSION_56_MAX_INDEX_COL_LEN);
memcpy(buff, sorted, sort_len);
memcpy(buff, sorted, true_len);
} else {
memcpy(buff, src_start, true_len);
}
buff += true_len;
/* Pad the unused space with spaces. */
#ifdef REMOVED
if (true_len < key_len) {
ulint pad_len = key_len - true_len;
ut_a(!(pad_len % cs->mbminlen));
cs->cset->fill(cs, buff, pad_len,
0x20 /* space */);
buff += pad_len;
}
#endif /* REMOVED */
}
}

2
storage/innobase/rem/rem0rec.cc
View file

@ -2058,7 +2058,7 @@ wsrep_rec_get_foreign_key(
case DATA_MYSQL:
/* Copy the actual data */
ut_memcpy(buf, data, len);
*buf_len = wsrep_innobase_mysql_sort(
len = wsrep_innobase_mysql_sort(
(int)
(col_f->prtype & DATA_MYSQL_TYPE_MASK),
(uint)

27
storage/xtradb/handler/ha_innodb.cc
View file

@ -6708,7 +6708,6 @@ wsrep_store_key_val_for_row(
const byte* data;
ulint key_len;
ulint true_len;
ulint sort_len;
const CHARSET_INFO* cs;
int error=0;
@ -6751,12 +6750,12 @@ wsrep_store_key_val_for_row(
}
memcpy(sorted, data, true_len);
sort_len = wsrep_innobase_mysql_sort(
true_len = wsrep_innobase_mysql_sort(
mysql_type, cs->number, sorted, true_len,
REC_VERSION_56_MAX_INDEX_COL_LEN);
if (wsrep_protocol_version > 1) {
memcpy(buff, sorted, sort_len);
memcpy(buff, sorted, true_len);
/* Note that we always reserve the maximum possible
length of the true VARCHAR in the key value, though
only len first bytes after the 2 length bytes contain
@ -6777,7 +6776,6 @@ wsrep_store_key_val_for_row(
const CHARSET_INFO* cs;
ulint key_len;
ulint true_len;
ulint sort_len;
int error=0;
ulint blob_len;
const byte* blob_data;
@ -6826,11 +6824,11 @@ wsrep_store_key_val_for_row(
}
memcpy(sorted, blob_data, true_len);
sort_len = wsrep_innobase_mysql_sort(
true_len = wsrep_innobase_mysql_sort(
mysql_type, cs->number, sorted, true_len,
REC_VERSION_56_MAX_INDEX_COL_LEN);
memcpy(buff, sorted, sort_len);
memcpy(buff, sorted, true_len);
/* Note that we always reserve the maximum possible
length of the BLOB prefix in the key value. */
@ -6847,7 +6845,6 @@ wsrep_store_key_val_for_row(
const CHARSET_INFO* cs = NULL;
ulint true_len;
ulint sort_len;
ulint key_len;
const uchar* src_start;
int error=0;
@ -6892,28 +6889,16 @@ wsrep_store_key_val_for_row(
&error);
}
memcpy(sorted, src_start, true_len);
sort_len = wsrep_innobase_mysql_sort(
true_len = wsrep_innobase_mysql_sort(
mysql_type, cs->number, sorted, true_len,
REC_VERSION_56_MAX_INDEX_COL_LEN);
memcpy(buff, sorted, sort_len);
memcpy(buff, sorted, true_len);
} else {
memcpy(buff, src_start, true_len);
}
buff += true_len;
/* Pad the unused space with spaces. */
#ifdef REMOVED
if (true_len < key_len) {
ulint pad_len = key_len - true_len;
ut_a(!(pad_len % cs->mbminlen));
cs->cset->fill(cs, buff, pad_len,
0x20 /* space */);
buff += pad_len;
}
#endif /* REMOVED */
}
}

2
storage/xtradb/rem/rem0rec.cc
View file

@ -2016,7 +2016,7 @@ wsrep_rec_get_foreign_key(
case DATA_MYSQL:
/* Copy the actual data */
ut_memcpy(buf, data, len);
*buf_len = wsrep_innobase_mysql_sort(
len = wsrep_innobase_mysql_sort(
(int)
(col_f->prtype & DATA_MYSQL_TYPE_MASK),
(uint)