From 96529999107c589de3e9dd69347b844c2a65de16 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Sun, 6 Mar 2011 13:13:39 -0800 Subject: [PATCH] Paranoia: use db name 'devcamlistore', not 'camlistore' --- dev-indexer | 6 +++--- server/go/blobserver/camlistored.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-indexer b/dev-indexer index 2d9e3a26c..2d9975b3a 100755 --- a/dev-indexer +++ b/dev-indexer @@ -29,9 +29,9 @@ unless (-d $root) { } if ($opt_wipe) { - system("mysqladmin", "-uroot", "-proot", "drop", "camlistore"); - system("mysqladmin", "-uroot", "-proot", "create", "camlistore") and die "Could not create MySQL database on localhost.\n"; - my $dbh = DBI->connect("DBI:mysql:database=camlistore", "root", "root", { + system("mysqladmin", "-uroot", "-proot", "drop", "devcamlistore"); + system("mysqladmin", "-uroot", "-proot", "create", "devcamlistore") and die "Could not create MySQL database on localhost.\n"; + my $dbh = DBI->connect("DBI:mysql:database=devcamlistore", "root", "root", { "RaiseError" => 1, }) or die "Failed to connect to MySQL on localhost.\n"; diff --git a/server/go/blobserver/camlistored.go b/server/go/blobserver/camlistored.go index ea03c942a..4c257f335 100644 --- a/server/go/blobserver/camlistored.go +++ b/server/go/blobserver/camlistored.go @@ -186,7 +186,7 @@ func main() { Host: "localhost", User: "root", Password: "root", - Database: "camlistore", + Database: "devcamlistore", } if ok, err := myIndexer.IsAlive(); !ok { log.Fatalf("Could not connect indexer to MySQL server: %s", err)