*** pgsql/src/backend/executor/execMain.c 2009/01/22 20:16:03 1.321 --- pgsql/src/backend/executor/execMain.c 2009/02/02 19:31:39 1.322 *************** *** 26,32 **** * * * IDENTIFICATION ! * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.320 2009/01/01 17:23:41 momjian Exp $ * *------------------------------------------------------------------------- */ --- 26,32 ---- * * * IDENTIFICATION ! * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.321 2009/01/22 20:16:03 tgl Exp $ * *------------------------------------------------------------------------- */ *************** OpenIntoRel(QueryDesc *queryDesc) *** 2832,2837 **** --- 2832,2838 ---- Oid intoRelationId; TupleDesc tupdesc; DR_intorel *myState; + static char *validnsps[] = HEAP_RELOPT_NAMESPACES; Assert(into); *************** OpenIntoRel(QueryDesc *queryDesc) *** 2890,2895 **** --- 2891,2898 ---- /* Parse and validate any reloptions */ reloptions = transformRelOptions((Datum) 0, into->options, + NULL, + validnsps, true, false); (void) heap_reloptions(RELKIND_RELATION, reloptions, true); *************** OpenIntoRel(QueryDesc *queryDesc) *** 2926,2932 **** * AlterTableCreateToastTable ends with CommandCounterIncrement(), so that * the TOAST table will be visible for insertion. */ ! AlterTableCreateToastTable(intoRelationId); /* * And open the constructed table for writing. --- 2929,2944 ---- * AlterTableCreateToastTable ends with CommandCounterIncrement(), so that * the TOAST table will be visible for insertion. */ ! reloptions = transformRelOptions((Datum) 0, ! into->options, ! "toast", ! validnsps, ! true, ! false); ! ! (void) heap_reloptions(RELKIND_TOASTVALUE, reloptions, true); ! ! AlterTableCreateToastTable(intoRelationId, reloptions); /* * And open the constructed table for writing.