diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2019-05-11 22:19:05 +0300 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2019-05-11 22:19:05 +0300 |
commit | cb248f880619431850e5638009a6098048050edf (patch) | |
tree | 32858b1936d56c8391abf003fbdf6a9d6ba9a5e9 /storage/mroonga/test | |
parent | c0ac0b886047496e105a566a063bf1bd932d00a4 (diff) | |
parent | 5543b75550962f07b4adcd47a6e52accec0a7d0f (diff) | |
download | mariadb-git-cb248f880619431850e5638009a6098048050edf.tar.gz |
Merge branch '5.5' into 10.1
Diffstat (limited to 'storage/mroonga/test')
-rwxr-xr-x | storage/mroonga/test/run-sql-test.sh | 2 | ||||
-rw-r--r-- | storage/mroonga/test/unit/test_mrn_path_mapper.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/mroonga/test/run-sql-test.sh b/storage/mroonga/test/run-sql-test.sh index d3aaf6aecf7..589de4788c6 100755 --- a/storage/mroonga/test/run-sql-test.sh +++ b/storage/mroonga/test/run-sql-test.sh @@ -16,7 +16,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA export BASE_DIR="$(cd $(dirname $0); pwd)" top_dir="$BASE_DIR/.." diff --git a/storage/mroonga/test/unit/test_mrn_path_mapper.cpp b/storage/mroonga/test/unit/test_mrn_path_mapper.cpp index 54a9f35b03f..3ede8726f10 100644 --- a/storage/mroonga/test/unit/test_mrn_path_mapper.cpp +++ b/storage/mroonga/test/unit/test_mrn_path_mapper.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #include <string.h> |