diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-09-11 20:43:48 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-09-11 20:43:48 +0200 |
| commit | a3d80d952d7b99680ca4a3a89e128ecc0d490c10 (patch) | |
| tree | 0d72ee69e037cdd09618ddb53652dd1b220890dc /storage/federatedx | |
| parent | ec06ba24553d2d83b3a6a6bc4d8150910b01ee7c (diff) | |
| parent | 966661c8cc75dd7d540a5fe40b4d893c40e91d26 (diff) | |
| download | mariadb-git-a3d80d952d7b99680ca4a3a89e128ecc0d490c10.tar.gz | |
merge with 5.1
Diffstat (limited to 'storage/federatedx')
| -rw-r--r-- | storage/federatedx/Makefile.am | 7 | ||||
| -rw-r--r-- | storage/federatedx/ha_federatedx.cc | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/storage/federatedx/Makefile.am b/storage/federatedx/Makefile.am index 1781a53a0b6..1e76ac15266 100644 --- a/storage/federatedx/Makefile.am +++ b/storage/federatedx/Makefile.am @@ -20,14 +20,13 @@ noinst_HEADERS = ha_federatedx.h federatedx_probes.h EXTRA_LTLIBRARIES = ha_federatedx.la pkgplugin_LTLIBRARIES = @plugin_federatedx_shared_target@ ha_federatedx_la_LDFLAGS = -module -rpath $(pkgplugindir) -ha_federatedx_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -ha_federatedx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN +ha_federatedx_la_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN +ha_federatedx_la_CFLAGS = -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN EXTRA_LIBRARIES = libfederatedx.a noinst_LIBRARIES = @plugin_federatedx_static_target@ -libfederatedx_a_CXXFLAGS = $(AM_CFLAGS) -libfederatedx_a_CFLAGS = $(AM_CFLAGS) +libfederatedx_a_CXXFLAGS = $(AM_CXXFLAGS) libfederatedx_a_SOURCES= ha_federatedx.cc federatedx_txn.cc \ federatedx_io.cc federatedx_io_null.cc \ federatedx_io_mysql.cc diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc index 8735e5625e6..2749034cba2 100644 --- a/storage/federatedx/ha_federatedx.cc +++ b/storage/federatedx/ha_federatedx.cc @@ -2967,10 +2967,13 @@ int ha_federatedx::rnd_pos(uchar *buf, uchar *pos) DBUG_ENTER("ha_federatedx::rnd_pos"); ha_statistic_increment(&SSV::ha_read_rnd_count); + /* We have to move this to 'ref' to get things aligned */ + bmove(ref, pos, ref_length); + if ((retval= txn->acquire(share, TRUE, &io))) goto error; - if ((retval= io->seek_position(&result, pos))) + if ((retval= io->seek_position(&result, ref))) goto error; retval= read_next(buf, result); |