diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-06-24 07:16:08 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-06-24 07:16:08 +0300 |
| commit | 2e4984c185ddcd2da789017cd147338846ff409a (patch) | |
| tree | 0293831900c860600efbaa747ea886d9d1cbf5bd /storage/mroonga/vendor/groonga/lib/mrb/mrb_void.c | |
| parent | 792b53e80806df893ee62c9a1c1bd117114c8c6d (diff) | |
| parent | a6087e7dc1ef3561d8189c8db15e9591d0f9b520 (diff) | |
| download | mariadb-git-2e4984c185ddcd2da789017cd147338846ff409a.tar.gz | |
Merge tag 'mariadb-10.0.20' into 10.0-FusionIO10.0-FusionIO
Conflicts:
storage/innobase/os/os0file.cc
storage/xtradb/os/os0file.cc
storage/xtradb/srv/srv0start.cc
Diffstat (limited to 'storage/mroonga/vendor/groonga/lib/mrb/mrb_void.c')
| -rw-r--r-- | storage/mroonga/vendor/groonga/lib/mrb/mrb_void.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/mroonga/vendor/groonga/lib/mrb/mrb_void.c b/storage/mroonga/vendor/groonga/lib/mrb/mrb_void.c index 976c472be92..bdc451930f6 100644 --- a/storage/mroonga/vendor/groonga/lib/mrb/mrb_void.c +++ b/storage/mroonga/vendor/groonga/lib/mrb/mrb_void.c @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../ctx_impl.h" +#include "../grn_ctx_impl.h" #ifdef GRN_WITH_MRUBY #include <mruby.h> @@ -24,7 +24,7 @@ #include <mruby/variable.h> #include <mruby/data.h> -#include "../db.h" +#include "../grn_db.h" #include "mrb_void.h" static struct mrb_data_type mrb_grn_void_type = { |