diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-28 13:46:22 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-28 13:46:22 +0200 |
commit | a64cb6d26508c1781091ae53c8d3950952f0ed0e (patch) | |
tree | 7d5c0873421e6fde4682512dd79392f420dc67b6 /storage/innobase/rem | |
parent | 478b83032b170b2ae030fa77fe4bed60a7910472 (diff) | |
parent | 7f037b8c9f38b11a8c5038763cea273ff7fc8136 (diff) | |
download | mariadb-git-a64cb6d26508c1781091ae53c8d3950952f0ed0e.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/rem')
-rw-r--r-- | storage/innobase/rem/rem0rec.cc | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/storage/innobase/rem/rem0rec.cc b/storage/innobase/rem/rem0rec.cc index b3c2fc84231..1cc11415615 100644 --- a/storage/innobase/rem/rem0rec.cc +++ b/storage/innobase/rem/rem0rec.cc @@ -2761,9 +2761,24 @@ wsrep_rec_get_foreign_key( break; case DATA_BLOB: case DATA_BINARY: + case DATA_FIXBINARY: + case DATA_GEOMETRY: memcpy(buf, data, len); break; - default: + + case DATA_FLOAT: + { + float f = mach_float_read(data); + memcpy(buf, &f, sizeof(float)); + } + break; + case DATA_DOUBLE: + { + double d = mach_double_read(data); + memcpy(buf, &d, sizeof(double)); + } + break; + default: break; } |