mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-17 20:37:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.3 into 10.4

Browse source
This commit is contained in:
Marko Mäkelä 2018-11-06 16:24:16 +02:00
commit 074c684099
394 changed files with 28433 additions and 14888 deletions
Download patch file Download diff file Expand all files Collapse all files

4
storage/mroonga/lib/mrn_multiple_column_key_codec.cpp
View file

@ -89,11 +89,13 @@ namespace mrn {
for (int i = 0; i < n_key_parts && current_mysql_key < mysql_key_end; i++) {
KEY_PART_INFO *key_part = &(key_info_->key_part[i]);
Field *field = key_part->field;
bool is_null = false;
DBUG_PRINT("info", ("mroonga: key_part->length=%u", key_part->length));
if (field->null_bit) {
DBUG_PRINT("info", ("mroonga: field has null bit"));
*current_grn_key = 0;
is_null = *current_mysql_key;
current_mysql_key += 1;
current_grn_key += 1;
(*grn_key_length)++;
@ -164,7 +166,7 @@ namespace mrn {
{
Field_datetimef *datetimef_field =
static_cast<Field_datetimef *>(field);
long long int mysql_datetime_packed =
long long int mysql_datetime_packed = is_null ? 0 :
my_datetime_packed_from_binary(current_mysql_key,
datetimef_field->decimals());
MYSQL_TIME mysql_time;