Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 779927d

Browse files
committed
fix some gcc-ism's
1 parent fc041ff commit 779927d

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

contrib/mmts/multimaster--1.0.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ CREATE FUNCTION mtm.referee_poll(xid bigint) RETURNS bigint
103103
AS 'MODULE_PATHNAME','mtm_referee_poll'
104104
LANGUAGE C;
105105

106-
CREATE TABLE IF NOT EXISTS mtm.local_tables(rel_schema text, rel_name text, primary key(rel_schema, rel_name));
106+
CREATE TABLE IF NOT EXISTS mtm.local_tables(rel_schema name, rel_name name, primary key(rel_schema, rel_name));
107107

108108
CREATE OR REPLACE FUNCTION mtm.alter_sequences() RETURNS boolean AS
109109
$$

contrib/mmts/multimaster.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -913,14 +913,15 @@ MtmResetTransaction()
913913
x->gid[0] = '\0';
914914
}
915915

916-
916+
#if 0
917917
static const char* const isoLevelStr[] =
918918
{
919919
"read uncommitted",
920920
"read committed",
921921
"repeatable read",
922922
"serializable"
923923
};
924+
#endif
924925

925926
bool MtmTransIsActive(void)
926927
{
@@ -2588,8 +2589,8 @@ void MtmMakeTableLocal(char const* schema, char const* name)
25882589

25892590

25902591
typedef struct {
2591-
text schema;
2592-
text name;
2592+
NameData schema;
2593+
NameData name;
25932594
} MtmLocalTablesTuple;
25942595

25952596
static void MtmLoadLocalTables(void)
@@ -2609,7 +2610,7 @@ static void MtmLoadLocalTables(void)
26092610
while (HeapTupleIsValid(tuple = systable_getnext(scan)))
26102611
{
26112612
MtmLocalTablesTuple *t = (MtmLocalTablesTuple*) GETSTRUCT(tuple);
2612-
MtmMakeTableLocal(text_to_cstring(&t->schema), text_to_cstring(&t->name));
2613+
MtmMakeTableLocal(NameStr(t->schema), NameStr(t->name));
26132614
}
26142615

26152616
systable_endscan(scan);

0 commit comments

Comments
 (0)