aboutsummaryrefslogtreecommitdiff
path: root/src/backend/commands/tablecmds.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2004-08-31 15:56:39 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2004-08-31 15:56:39 +0000
commit556110f4e0fa70e90647886ad4c157471fee53d7 (patch)
tree2a554dfc03d8d85fddc7bf7be7143ffe51916f3e /src/backend/commands/tablecmds.c
parentb4456e6d6abc4abdd8102d14d954e932cfa543d4 (diff)
downloadpostgresql-556110f4e0fa70e90647886ad4c157471fee53d7.tar.gz
postgresql-556110f4e0fa70e90647886ad4c157471fee53d7.zip
copy_relation_data was mistakenly assuming that the source relation
would always be already open at the smgr level. Per bug report from Fabien Coelho.
Diffstat (limited to 'src/backend/commands/tablecmds.c')
-rw-r--r--src/backend/commands/tablecmds.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index ab0d659dc5b..d14fb35ca3d 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.129 2004/08/29 05:06:41 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.130 2004/08/31 15:56:39 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -5434,7 +5434,7 @@ ATExecSetTableSpace(Oid tableOid, Oid newTableSpace)
static void
copy_relation_data(Relation rel, SMgrRelation dst)
{
- SMgrRelation src = rel->rd_smgr;
+ SMgrRelation src;
bool use_wal;
BlockNumber nblocks;
BlockNumber blkno;
@@ -5457,6 +5457,9 @@ copy_relation_data(Relation rel, SMgrRelation dst)
use_wal = XLogArchivingActive() && !rel->rd_istemp;
nblocks = RelationGetNumberOfBlocks(rel);
+ /* RelationGetNumberOfBlocks will certainly have opened rd_smgr */
+ src = rel->rd_smgr;
+
for (blkno = 0; blkno < nblocks; blkno++)
{
smgrread(src, blkno, buf);