Commit58d1eea

committed

Fix for arm32 and fix for dbname with dash.

1 parent73bfcf6 commit58d1eeaCopy full SHA for 58d1eea

File tree

-8

lines changed

-8

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`#`
`12`	`12`	`#`
`13`	`13`	`# IDENTIFICATION`
`14`		`-# $Header: /cvsroot/pgsql/src/bin/createdb/Attic/createdb.sh,v 1.11 1998/09/03 02:12:14 momjian Exp $`
	`14`	`+# $Header: /cvsroot/pgsql/src/bin/createdb/Attic/createdb.sh,v 1.12 1999/11/18 21:47:37 momjian Exp $`
`15`	`15`	`#`
`16`	`16`	`#-------------------------------------------------------------------------`
`17`	`17`
`@@ -111,7 +111,7 @@ else`
`111`	`111`	`fi`
`112`	`112`	`fi`
`113`	`113`
`114`		`-psql$PASSWDOPT -tq$AUTHOPT$PGHOSTOPT$PGPORTOPT -c"create database$dbname$location$encoding" template1`
	`114`	`+psql$PASSWDOPT -tq$AUTHOPT$PGHOSTOPT$PGPORTOPT -c"create database\"$dbname\"$location$encoding" template1`
`115`	`115`
`116`	`116`	`if [$?-ne 0 ];then`
`117`	`117`	`echo"$CMDNAME: database creation failed on$dbname."`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`#`
`12`	`12`	`#`
`13`	`13`	`# IDENTIFICATION`
`14`		`-# $Header: /cvsroot/pgsql/src/bin/destroydb/Attic/destroydb.sh,v 1.8 1997/06/02 02:53:00 scrappy Exp $`
	`14`	`+# $Header: /cvsroot/pgsql/src/bin/destroydb/Attic/destroydb.sh,v 1.9 1999/11/18 21:47:37 momjian Exp $`
`15`	`15`	`#`
`16`	`16`	`#-------------------------------------------------------------------------`
`17`	`17`
`@@ -75,7 +75,7 @@ fi`
`75`	`75`
`76`	`76`	`if ["$answer"= y ]`
`77`	`77`	`then`
`78`		`- psql -tq$AUTHOPT$PGHOSTOPT$PGPORTOPT -c"drop database$dbname" template1`
	`78`	`+ psql -tq$AUTHOPT$PGHOSTOPT$PGPORTOPT -c"drop database\"$dbname\"" template1`
`79`	`79`	`if [$?-ne 0 ]`
`80`	`80`	`thenecho"$CMDNAME: database destroy failed on$dbname."`
`81`	`81`	`exit 1`

Lines changed: 1 addition & 1 deletion

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.65 1999/11/06 01:55:43 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.66 1999/11/18 21:47:41 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -124,7 +124,7 @@ __asm__("lock; xchgb %0,%1": "=q"(_res), "=m"(*lock):"0"(_res));`
`124`	`124`
`125`	`125`
`126`	`126`
`127`		`-#if defined(__arm32__)\|\| defined(__arm__)`
	`127`	`+#if defined(__arm__)\|\| defined(__arm__)`
`128`	`128`	`#defineTAS(lock) tas(lock)`
`129`	`129`
`130`	`130`	`static __inline__int`
`@@ -136,7 +136,7 @@ __asm__("swpb %0, %0, [%3]": "=r"(_res), "=m"(*lock):"0"(_res), "r" (lock));`
`136`	`136`	`return (int)_res;`
`137`	`137`	`}`
`138`	`138`
`139`		`-#endif/__arm32__ /`
	`139`	`+#endif/__arm__ /`
`140`	`140`
`141`	`141`
`142`	`142`

Comments

(0)