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

Commit 58d1eea

Browse files
committed
Fix for arm32 and fix for dbname with dash.
1 parent 73bfcf6 commit 58d1eea

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/bin/createdb/createdb.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#
1212
#
1313
# 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 $
1515
#
1616
#-------------------------------------------------------------------------
1717

@@ -111,7 +111,7 @@ else
111111
fi
112112
fi
113113

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
115115

116116
if [ $? -ne 0 ]; then
117117
echo "$CMDNAME: database creation failed on $dbname."

src/bin/destroydb/destroydb.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#
1212
#
1313
# 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 $
1515
#
1616
#-------------------------------------------------------------------------
1717

@@ -75,7 +75,7 @@ fi
7575

7676
if [ "$answer" = y ]
7777
then
78-
psql -tq $AUTHOPT $PGHOSTOPT $PGPORTOPT -c "drop database $dbname" template1
78+
psql -tq $AUTHOPT $PGHOSTOPT $PGPORTOPT -c "drop database \"$dbname\"" template1
7979
if [ $? -ne 0 ]
8080
then echo "$CMDNAME: database destroy failed on $dbname."
8181
exit 1

src/include/port/bsd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#define HAS_TEST_AND_SET
2525
#endif
2626

27-
#if defined(__arm32__)
27+
#if defined(__arm__)
2828
#define HAS_TEST_AND_SET
2929
#endif
3030

src/include/storage/s_lock.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* 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 $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -124,7 +124,7 @@ __asm__("lock; xchgb %0,%1": "=q"(_res), "=m"(*lock):"0"(_res));
124124

125125

126126

127-
#if defined(__arm32__) || defined(__arm__)
127+
#if defined(__arm__) || defined(__arm__)
128128
#define TAS(lock) tas(lock)
129129

130130
static __inline__ int
@@ -136,7 +136,7 @@ __asm__("swpb %0, %0, [%3]": "=r"(_res), "=m"(*lock):"0"(_res), "r" (lock));
136136
return (int) _res;
137137
}
138138

139-
#endif /* __arm32__ */
139+
#endif /* __arm__ */
140140

141141

142142

0 commit comments

Comments
 (0)