Changeset: 99e91a009152 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=99e91a009152
Modified Files:
tools/merovingian/utils/database.c
Branch: Jul2012
Log Message:
db_rename: don't even attempt to move to an existing db
(transplanted from 8393cd29037076e09acb3dbeeef9c2d97d70a833)
diffs (22 lines):
diff --git a/tools/merovingian/utils/database.c
b/tools/merovingian/utils/database.c
--- a/tools/merovingian/utils/database.c
+++ b/tools/merovingian/utils/database.c
@@ -276,6 +276,18 @@ char* db_rename(char *olddb, char *newdb
if ((p = db_validname(newdb)) != NULL)
return(p);
+ if ((p = msab_getStatus(&stats, newdb)) != NULL) {
+ snprintf(buf, sizeof(buf), "internal error: %s", p);
+ free(p);
+ return(strdup(buf));
+ }
+ if (stats != NULL) {
+ msab_freeStatus(&stats);
+ snprintf(buf, sizeof(buf), "a database with the same name "
+ "already exists: %s", newdb);
+ return(strdup(buf));
+ }
+
if ((p = msab_getStatus(&stats, olddb)) != NULL) {
snprintf(buf, sizeof(buf), "internal error: %s", p);
free(p);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
