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_procedure.h | |
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_procedure.h')
-rw-r--r-- | storage/mroonga/vendor/groonga/lib/mrb/mrb_procedure.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/mroonga/vendor/groonga/lib/mrb/mrb_procedure.h b/storage/mroonga/vendor/groonga/lib/mrb/mrb_procedure.h index 16a4b32895c..36bd10fdab9 100644 --- a/storage/mroonga/vendor/groonga/lib/mrb/mrb_procedure.h +++ b/storage/mroonga/vendor/groonga/lib/mrb/mrb_procedure.h @@ -19,7 +19,7 @@ #ifndef GRN_MRB_PROCEDURE_H #define GRN_MRB_PROCEDURE_H -#include "../ctx.h" +#include "../grn_ctx.h" #ifdef __cplusplus extern "C" { |