diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-11 16:29:51 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-11 16:29:51 +0200 |
commit | 8de233af815f28d096ac4ff136525abc3ddc771d (patch) | |
tree | 98c524bbad2ebdced9635b83e51f647dac978cfc /storage/innobase/rem/rem0rec.cc | |
parent | 1015cbde5985e7e89c887ab30ce7c772671194c5 (diff) | |
parent | fd5e103aa4b97e080dd497b93992e5f32ef83fdf (diff) | |
download | mariadb-git-8de233af815f28d096ac4ff136525abc3ddc771d.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/rem/rem0rec.cc')
-rw-r--r-- | storage/innobase/rem/rem0rec.cc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/storage/innobase/rem/rem0rec.cc b/storage/innobase/rem/rem0rec.cc index e98448624b3..ee7bf37f667 100644 --- a/storage/innobase/rem/rem0rec.cc +++ b/storage/innobase/rem/rem0rec.cc @@ -2735,8 +2735,23 @@ wsrep_rec_get_foreign_key( break; case DATA_BLOB: case DATA_BINARY: + case DATA_FIXBINARY: + case DATA_GEOMETRY: memcpy(buf, data, len); break; + + 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; } |