*** src/test/regress/expected/variable.out 2013-06-17 13:48:44.207807720 +0200 --- src/test/regress/results/variable.out 2013-06-17 13:49:08.479808370 +0200 *************** *** 128,133 **** --- 128,136 ---- SET DATESTYLE = DMY, MDY; ERROR: invalid value for parameter "DateStyle": "dmy, mdy" DETAIL: Conflicting "datestyle" specifications. + SET DATESTYLE = DMY, YMD; + ERROR: invalid value for parameter "DateStyle": "dmy, ymd" + DETAIL: Conflicting "datestyle" specifications. SET DATESTYLE = YMD, DMY; ERROR: invalid value for parameter "DateStyle": "ymd, dmy" DETAIL: Conflicting "datestyle" specifications. *************** *** 155,161 **** ERROR: invalid value for parameter "DateStyle": "invalid_keyword" DETAIL: Unrecognized key word: "invalid_keyword". -- Should work. Valid value for SET TIMEZONE INTERVAL ! SET DATESTYLE = DEFAULT; -- Should work. Valid value for SET TIMEZONE INTERVAL SET TIME ZONE INTERVAL '+05:30' HOUR TO MINUTE; -- Should fail. Invalid values for INTERVAL in SET TIMEZONE INTERVAL --- 158,164 ---- ERROR: invalid value for parameter "DateStyle": "invalid_keyword" DETAIL: Unrecognized key word: "invalid_keyword". -- Should work. Valid value for SET TIMEZONE INTERVAL ! SET DATESTYLE TO DEFAULT; -- Should work. Valid value for SET TIMEZONE INTERVAL SET TIME ZONE INTERVAL '+05:30' HOUR TO MINUTE; -- Should fail. Invalid values for INTERVAL in SET TIMEZONE INTERVAL ======================================================================