Merge branch 'PGPROEE10' into PGPROEE10_pg_shardman

Author: vbwagner

contrib/pg_hint_plan/expected/ut-A.out

@@ -1590,76 +1590,6 @@ error hint:
    Filter: (c1 = 1)
 (2 rows)
 
--- No. A-7-3-10
--- No. A-9-2-10
-/*+SeqScan(あ)*/
-EXPLAIN (COSTS false) SELECT * FROM s1.t1 あ WHERE あ.c1 = 1;
-LOG:  statement: /*+SeqScan(あ)*/
-EXPLAIN (COSTS false) SELECT * FROM s1.t1 あ WHERE あ.c1 = 1;
-LOG:  pg_hint_plan:
-used hint:
-SeqScan(あ)
-not used hint:
-duplication hint:
-error hint:
-
-     QUERY PLAN      
----------------------
- Seq Scan on t1 "あ"
-   Filter: (c1 = 1)
-(2 rows)
-
-/*+SeqScan(あいう)*/
-EXPLAIN (COSTS false) SELECT * FROM s1.t1 あいう WHERE あいう.c1 = 1;
-LOG:  statement: /*+SeqScan(あいう)*/
-EXPLAIN (COSTS false) SELECT * FROM s1.t1 あいう WHERE あいう.c1 = 1;
-LOG:  pg_hint_plan:
-used hint:
-SeqScan(あいう)
-not used hint:
-duplication hint:
-error hint:
-
-       QUERY PLAN        
--------------------------
- Seq Scan on t1 "あいう"
-   Filter: (c1 = 1)
-(2 rows)
-
-/*+SeqScan("あ")*/
-EXPLAIN (COSTS false) SELECT * FROM s1.t1 あ WHERE あ.c1 = 1;
-LOG:  statement: /*+SeqScan("あ")*/
-EXPLAIN (COSTS false) SELECT * FROM s1.t1 あ WHERE あ.c1 = 1;
-LOG:  pg_hint_plan:
-used hint:
-SeqScan(あ)
-not used hint:
-duplication hint:
-error hint:
-
-     QUERY PLAN      
----------------------
- Seq Scan on t1 "あ"
-   Filter: (c1 = 1)
-(2 rows)
-
-/*+SeqScan("あいう")*/
-EXPLAIN (COSTS false) SELECT * FROM s1.t1 あいう WHERE あいう.c1 = 1;
-LOG:  statement: /*+SeqScan("あいう")*/
-EXPLAIN (COSTS false) SELECT * FROM s1.t1 あいう WHERE あいう.c1 = 1;
-LOG:  pg_hint_plan:
-used hint:
-SeqScan(あいう)
-not used hint:
-duplication hint:
-error hint:
-
-       QUERY PLAN        
--------------------------
- Seq Scan on t1 "あいう"
-   Filter: (c1 = 1)
-(2 rows)
-
 -- No. A-7-3-11
 -- No. A-9-2-11
 /*+SeqScan(/**/)*/

contrib/pg_hint_plan/sql/ut-A.sql

@@ -438,17 +438,6 @@ EXPLAIN (COSTS false) SELECT * FROM s1.t1 "Set" WHERE "Set".c1 = 1;
 /*+SeqScan("Set SeqScan Leading")*/
 EXPLAIN (COSTS false) SELECT * FROM s1.t1 "Set SeqScan Leading" WHERE "Set SeqScan Leading".c1 = 1;
 
--- No. A-7-3-10
--- No. A-9-2-10
-/*+SeqScan(あ)*/
-EXPLAIN (COSTS false) SELECT * FROM s1.t1 あ WHERE あ.c1 = 1;
-/*+SeqScan(あいう)*/
-EXPLAIN (COSTS false) SELECT * FROM s1.t1 あいう WHERE あいう.c1 = 1;
-/*+SeqScan("あ")*/
-EXPLAIN (COSTS false) SELECT * FROM s1.t1 あ WHERE あ.c1 = 1;
-/*+SeqScan("あいう")*/
-EXPLAIN (COSTS false) SELECT * FROM s1.t1 あいう WHERE あいう.c1 = 1;
-
 -- No. A-7-3-11
 -- No. A-9-2-11
 /*+SeqScan(/**/)*/

doc/src/sgml/contrib.sgml

@@ -124,6 +124,7 @@ CREATE EXTENSION <replaceable>module_name</> FROM unpackaged;
  &fuzzystrmatch;
  &hstore;
  &hunspell-dict;
+ &in-memory;
  &intagg;
  &intarray;
  &isn;

doc/src/sgml/filelist.sgml

@@ -128,6 +128,7 @@
 <!ENTITY fulleq          SYSTEM "fulleq.sgml">
 <!ENTITY hstore          SYSTEM "hstore.sgml">
 <!ENTITY hunspell-dict   SYSTEM "hunspell-dict.sgml">
+<!ENTITY in-memory       SYSTEM "in-memory.sgml">
 <!ENTITY intagg          SYSTEM "intagg.sgml">
 <!ENTITY intarray        SYSTEM "intarray.sgml">
 <!ENTITY isn             SYSTEM "isn.sgml">