Change version to 1.1.4

1.1.3 has a crash bug raised by queries in specific shape involving
complex views and/or SQL functions.

It is fixed in this version.

diff --git a/COPYRIGHT b/COPYRIGHT
index bf54977..498483e 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,4 +1,4 @@
-Copyright (c) 2012-2014, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
+Copyright (c) 2012-2017, NIPPON TELEGRAPH AND TELEPHONE CORPORATION

 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/Makefile b/Makefile
index 81abc5e..4383cef 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 #
 # pg_hint_plan: Makefile
 #
 #
 # pg_hint_plan: Makefile
 #

-# Copyright (c) 2012-2014, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
+# Copyright (c) 2012-2017, NIPPON TELEGRAPH AND TELEPHONE CORPORATION

 #
 
 MODULES = pg_hint_plan
 #
 
 MODULES = pg_hint_plan

-HINTPLANVER = 1.1.3
+HINTPLANVER = 1.1.4

 
 REGRESS = init base_plan pg_hint_plan ut-init ut-A ut-S ut-J ut-L ut-G ut-R ut-fdw ut-fini
 
 
 REGRESS = init base_plan pg_hint_plan ut-init ut-A ut-S ut-J ut-L ut-G ut-R ut-fdw ut-fini
 


@@ -14,7 +14,8 @@ REGRESSION_EXPECTED = expected/init.out expected/base_plan.out expected/pg_hint_
 REGRESS_OPTS = --encoding=UTF8
 
 EXTENSION = pg_hint_plan
 REGRESS_OPTS = --encoding=UTF8
 
 EXTENSION = pg_hint_plan

-DATA = pg_hint_plan--1.1.3.sql pg_hint_plan--1.1.2--1.1.3.sql
+DATA = pg_hint_plan--1.1.4.sql pg_hint_plan--1.1.3--1.1.4.sql \
+       pg_hint_plan--1.1.2--1.1.3.sql

 
 EXTRA_CLEAN = sql/ut-fdw.sql expected/ut-fdw.out
 
 
 EXTRA_CLEAN = sql/ut-fdw.sql expected/ut-fdw.out
 


@@ -32,6 +33,8 @@ TARSOURCES = Makefile *.c  *.h COPYRIGHT* \
        doc/* expected/*.out sql/*.sql sql/maskout.sh \
        data/data.csv input/*.source output/*.source SPECS/*.spec
 
        doc/* expected/*.out sql/*.sql sql/maskout.sh \
        data/data.csv input/*.source output/*.source SPECS/*.spec
 

+LDFLAGS+=-Wl,--build-id
+

 installcheck: $(REGRESSION_EXPECTED)
 
 rpms: rpm94
 installcheck: $(REGRESSION_EXPECTED)
 
 rpms: rpm94

diff --git a/SPECS/pg_hint_plan94.spec b/SPECS/pg_hint_plan94.spec
index d9ab775..5627175 100644 (file)
--- a/SPECS/pg_hint_plan94.spec
+++ b/SPECS/pg_hint_plan94.spec
@@ -1,5 +1,5 @@
 # SPEC file for pg_hint_plan
 # SPEC file for pg_hint_plan

-# Copyright(C) 2012-2014 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
+# Copyright(C) 2012-2017 NIPPON TELEGRAPH AND TELEPHONE CORPORATION

 
 %define _pgdir   /usr/pgsql-9.4
 %define _bindir  %{_pgdir}/bin
 
 %define _pgdir   /usr/pgsql-9.4
 %define _bindir  %{_pgdir}/bin


@@ -13,7 +13,7 @@
 ## Set general information for pg_hint_plan.
 Summary:    Optimizer hint for PostgreSQL 9.4
 Name:       pg_hint_plan94
 ## Set general information for pg_hint_plan.
 Summary:    Optimizer hint for PostgreSQL 9.4
 Name:       pg_hint_plan94

-Version:    1.1.3
+Version:    1.1.4

 Release:    1%{?dist}
 License:    BSD
 Group:      Applications/Databases
 Release:    1%{?dist}
 License:    BSD
 Group:      Applications/Databases


@@ -61,7 +61,8 @@ install -d %{buildroot}%{_libdir}
 install pg_hint_plan.so %{buildroot}%{_libdir}/pg_hint_plan.so
 install -d %{buildroot}%{_datadir}/extension
 install -m 644 pg_hint_plan--1.1.2--1.1.3.sql %{buildroot}%{_datadir}/extension/pg_hint_plan--1.1.2--1.1.3.sql
 install pg_hint_plan.so %{buildroot}%{_libdir}/pg_hint_plan.so
 install -d %{buildroot}%{_datadir}/extension
 install -m 644 pg_hint_plan--1.1.2--1.1.3.sql %{buildroot}%{_datadir}/extension/pg_hint_plan--1.1.2--1.1.3.sql

-install -m 644 pg_hint_plan--1.1.3.sql %{buildroot}%{_datadir}/extension/pg_hint_plan--1.1.3.sql
+install -m 644 pg_hint_plan--1.1.3--1.1.4.sql %{buildroot}%{_datadir}/extension/pg_hint_plan--1.1.3--1.1.4.sql
+install -m 644 pg_hint_plan--1.1.4.sql %{buildroot}%{_datadir}/extension/pg_hint_plan--1.1.4.sql

 install -m 644 pg_hint_plan.control %{buildroot}%{_datadir}/extension/pg_hint_plan.control
 
 %clean
 install -m 644 pg_hint_plan.control %{buildroot}%{_datadir}/extension/pg_hint_plan.control
 
 %clean


@@ -72,11 +73,14 @@ rm -rf %{buildroot}
 %{_libdir}/pg_hint_plan.so
 %defattr(0644,root,root)
 %{_datadir}/extension/pg_hint_plan--1.1.2--1.1.3.sql
 %{_libdir}/pg_hint_plan.so
 %defattr(0644,root,root)
 %{_datadir}/extension/pg_hint_plan--1.1.2--1.1.3.sql

-%{_datadir}/extension/pg_hint_plan--1.1.3.sql
+%{_datadir}/extension/pg_hint_plan--1.1.3--1.1.4.sql
+%{_datadir}/extension/pg_hint_plan--1.1.4.sql

 %{_datadir}/extension/pg_hint_plan.control
 
 # History of pg_hint_plan.
 %changelog
 %{_datadir}/extension/pg_hint_plan.control
 
 # History of pg_hint_plan.
 %changelog

+* Fri May 19 2017 Kyotaro Horiguchi
+- Fixed a crash bug.

 * Thu Dec 22 2014 Kyotaro Horiguchi
 - Bug fix related to pl/pgsql.
 * Thu Dec 17 2014 Kyotaro Horiguchi
 * Thu Dec 22 2014 Kyotaro Horiguchi
 - Bug fix related to pl/pgsql.
 * Thu Dec 17 2014 Kyotaro Horiguchi

diff --git a/pg_hint_plan--1.1.3--1.1.4.sql b/pg_hint_plan--1.1.3--1.1.4.sql
new file mode 100644 (file)
index 0000000..dd7bd30
--- /dev/null
+++ b/pg_hint_plan--1.1.3--1.1.4.sql
@@ -0,0 +1,4 @@
+/* pg_hint_plan/pg_hint_plan--1.1.3--1.1.4.sql */
+
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "ALTER EXTENSION pg_hint_plan UPDATE" to load this file. \quit

diff --git a/pg_hint_plan--1.1.3.sql b/pg_hint_plan--1.1.4.sql
similarity index 92%
rename from pg_hint_plan--1.1.3.sql
rename to pg_hint_plan--1.1.4.sql
index 880838e..09b390f 100644 (file)
--- a/pg_hint_plan--1.1.3.sql
+++ b/pg_hint_plan--1.1.4.sql
@@ -1,4 +1,4 @@
-/* pg_hint_plan/pg_hint_plan--1.1.3.sql */
+/* pg_hint_plan/pg_hint_plan--1.1.4.sql */

 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
 \echo Use "CREATE EXTENSION pg_hint_plan" to load this file. \quit
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
 \echo Use "CREATE EXTENSION pg_hint_plan" to load this file. \quit

diff --git a/pg_hint_plan.c b/pg_hint_plan.c
index bc77320..c9d94fb 100644 (file)
--- a/pg_hint_plan.c
+++ b/pg_hint_plan.c
@@ -4,7 +4,7 @@
  *               do instructions or hints to the planner using C-style block comments
  *               of the SQL.
  *
  *               do instructions or hints to the planner using C-style block comments
  *               of the SQL.
  *

- * Copyright (c) 2012-2014, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
+ * Copyright (c) 2012-2017, NIPPON TELEGRAPH AND TELEPHONE CORPORATION

  *
  *-------------------------------------------------------------------------
  */
  *
  *-------------------------------------------------------------------------
  */

diff --git a/pg_hint_plan.control b/pg_hint_plan.control
index bd2d451..3a26288 100644 (file)
--- a/pg_hint_plan.control
+++ b/pg_hint_plan.control
@@ -1,6 +1,6 @@
 # pg_hint_plan extension
 
 comment = ''
 # pg_hint_plan extension
 
 comment = ''

-default_version = '1.1.3'
+default_version = '1.1.4'

 relocatable = false
 schema = hint_plan
 relocatable = false
 schema = hint_plan