diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2014-11-05 18:18:45 -0500 |
|---|---|---|
| committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2014-11-06 10:51:20 -0500 |
| commit | 1f741358bc48543349619d9e5d86d6c46b57abd7 (patch) | |
| tree | 0ce4eeff568f7e0685c92b6c7e2007e0a448f351 /src/third_party/wiredtiger/src/schema/schema_rename.c | |
| parent | 4da5ebab3d27b20508fb73179cd2f3799b6ee607 (diff) | |
| download | mongo-1f741358bc48543349619d9e5d86d6c46b57abd7.tar.gz | |
Import wiredtiger-wiredtiger-2.4.1-0-gee7388e.tar.gz from wiredtiger branch develop
Diffstat (limited to 'src/third_party/wiredtiger/src/schema/schema_rename.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/schema/schema_rename.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/third_party/wiredtiger/src/schema/schema_rename.c b/src/third_party/wiredtiger/src/schema/schema_rename.c index 8605ea41c80..d0d318b5b2c 100644 --- a/src/third_party/wiredtiger/src/schema/schema_rename.c +++ b/src/third_party/wiredtiger/src/schema/schema_rename.c @@ -17,7 +17,8 @@ __rename_file( { WT_DECL_RET; int exist; - const char *filename, *newfile, *newvalue, *oldvalue; + const char *filename, *newfile; + char *newvalue, *oldvalue; newvalue = oldvalue = NULL; @@ -83,7 +84,8 @@ __rename_tree(WT_SESSION_IMPL *session, WT_DECL_ITEM(nv); WT_DECL_ITEM(os); WT_DECL_RET; - const char *newname, *olduri, *suffix, *value; + const char *newname, *olduri, *suffix; + char *value; int is_colgroup; olduri = table->name; @@ -176,7 +178,7 @@ static int __metadata_rename(WT_SESSION_IMPL *session, const char *uri, const char *newuri) { WT_DECL_RET; - const char *value; + char *value; WT_RET(__wt_metadata_search(session, uri, &value)); WT_ERR(__wt_metadata_remove(session, uri)); @@ -216,7 +218,7 @@ __rename_table(WT_SESSION_IMPL *session, WT_ERR(__rename_tree(session, table, newuri, table->indices[i]->name, cfg)); - __wt_schema_remove_table(session, table); + WT_ERR(__wt_schema_remove_table(session, table)); table = NULL; /* Rename the table. */ |