From ec8ce55942fd4a978be36aa14e4efcf804c908ce Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 13 Sep 2010 15:08:01 +0200
Subject: Make test options consistent with MySQL

---
 libcommon/common/common.cxx  | 4 ++--
 libcommon/common/options.cli | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'libcommon/common')

diff --git a/libcommon/common/common.cxx b/libcommon/common/common.cxx
index 960a946..4d2d5f0 100644
--- a/libcommon/common/common.cxx
+++ b/libcommon/common/common.cxx
@@ -44,8 +44,8 @@ create_database (int argc, char* argv[], size_t max_connections)
   return auto_ptr<database> (
     new mysql::database (
       ops.user (),
-      ops.passwd_specified () ? &ops.passwd () : 0,
-      ops.db_name (),
+      ops.password_specified () ? &ops.password () : 0,
+      ops.database (),
       ops.host (),
       ops.port (),
       ops.socket_specified () ? &ops.socket () : 0,
diff --git a/libcommon/common/options.cli b/libcommon/common/options.cli
index 5b87d70..b5db026 100644
--- a/libcommon/common/options.cli
+++ b/libcommon/common/options.cli
@@ -17,13 +17,13 @@ namespace cli
       "MySQL database user."
     };
 
-    std::string --passwd
+    std::string --password
     {
       "<str>",
       "MySQL database password"
     };
 
-    std::string --db-name
+    std::string --database
     {
       "<name>",
       "MySQL database name."
-- 
cgit v1.1