From: Shawn Routhier <sar@isc.org>
Date: Mon, 15 Jun 2015 04:55:56 +0000 (-0700)
Subject: [3884] Fix up some cut and paste typos
X-Git-Tag: trac3830_base~13^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bdac8446d6f9b7fa702470fcc81a03253d69d820;p=thirdparty%2Fkea.git

[3884] Fix up some cut and paste typos
---

diff --git a/src/bin/admin/admin-utils.sh b/src/bin/admin/admin-utils.sh
index b118bdfaf0..c48f50ae71 100644
--- a/src/bin/admin/admin-utils.sh
+++ b/src/bin/admin/admin-utils.sh
@@ -47,11 +47,11 @@ mysql_version() {
 # pgsql_execute SQL_QUERY - This call is simpler, but requires db_user,
 #     db_password and db_name variables to be set.
 # pgsql_execute SQL_QUERY PARAM1 PARAM2 .. PARAMN - Additional parameters
-#     may be specified. They are passed directly to mysql. This one is
+#     may be specified. They are passed directly to pgsql. This one is
 #     more convenient to use if the script didn't parse db_user db_password
 #     and db_name.
 #
-# It returns the mysql command exit status to the caller as $?
+# It returns the pgsql command exit status to the caller as $?
 pgsql_execute() {
     QUERY=$1
     shift
@@ -71,11 +71,11 @@ pgsql_execute() {
 # pgsql_execute SQL_FILE - This call is simpler, but requires db_user,
 #     db_password and db_name variables to be set.
 # pgsql_execute SQL_FILE PARAM1 PARAM2 .. PARAMN - Additional parameters
-#     may be specified. They are passed directly to mysql. This one is
+#     may be specified. They are passed directly to pgsql. This one is
 #     more convenient to use if the script didn't parse db_user db_password
 #     and db_name.
 #
-# It returns the mysql command exit status to the caller as $?
+# It returns the pgsql command exit status to the caller as $?
 pgsql_execute_script() {
     file=$1
     shift
diff --git a/src/bin/admin/tests/pgsql_tests.sh.in b/src/bin/admin/tests/pgsql_tests.sh.in
index fc198c2745..a4bf9b0c4a 100644
--- a/src/bin/admin/tests/pgsql_tests.sh.in
+++ b/src/bin/admin/tests/pgsql_tests.sh.in
@@ -65,7 +65,7 @@ pgsql_lease_init_test() {
 
     # Check schema_version table
     RESULT=`pgsql_execute "SELECT version, minor FROM schema_version;"`
-    assert_eq 0 $? "schema_vesion table check failed, expected exit code: %d, actual: %d"
+    assert_eq 0 $? "schema_version table check failed, expected exit code: %d, actual: %d"
 
     # Check lease4 table
     RESULT=`pgsql_execute "SELECT address, hwaddr, client_id, valid_lifetime, expire, subnet_id, fqdn_fwd, fqdn_rev, hostname FROM lease4;"`