aboutsummaryrefslogtreecommitdiff
path: root/libcommon/common
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2010-09-13 15:08:01 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2010-09-13 15:08:01 +0200
commitec8ce55942fd4a978be36aa14e4efcf804c908ce (patch)
tree53f16f3b0f7b145c26c614cd51a819a2d7a4739f /libcommon/common
parent3fe2f0f8570ad9b6db2a550d2c313e5367e61fd1 (diff)
Make test options consistent with MySQL
Diffstat (limited to 'libcommon/common')
-rw-r--r--libcommon/common/common.cxx4
-rw-r--r--libcommon/common/options.cli4
2 files changed, 4 insertions, 4 deletions
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."