#
#
# patch "database.cc"
#  from [654ed9338365c7686d4f4cbd4dc2fe9864e14b4f]
#    to [f254a5b0227aeba143b95881a09d98e8754ff64d]
# 
# patch "project.cc"
#  from [9420c864da2224b567dd700699a3d9b81e4aa30d]
#    to [5b12a35283e894b9db1b6549cf2afac4f1cb6097]
# 
# patch "tests/drop_a_public_and_private_key/__driver__.lua"
#  from [2157acce39fb10e5d2144ef8bfd419e3c83ffb89]
#    to [1216e79a802889c3ebcdf3d532ebc4f7d55a1363]
# 
# patch "tests/drop_a_public_key/__driver__.lua"
#  from [ad6647be940a3cc1359b858c56c164f234f82059]
#    to [d61b77d1e87913a617e6a29cad5a3906c7a20fb0]
#
============================================================
--- database.cc	654ed9338365c7686d4f4cbd4dc2fe9864e14b4f
+++ database.cc	f254a5b0227aeba143b95881a09d98e8754ff64d
@@ -990,7 +990,7 @@ database::info(ostream & out, bool analy
                           "length(parent) + length(child)", total));
     bytes.push_back(imp->space("revision_certs",
                           "length(hash) + length(id) + length(name)"
-                          "+ length(value) + length(keypair)"
+                          "+ length(value) + length(keypair_id)"
                           "+ length(signature)", total));
     bytes.push_back(imp->space("heights", "length(revision) + length(height)",
                           total));
@@ -3224,6 +3224,7 @@ database_impl::get_oldstyle_certs(id con
                                   vector<cert> & certs,
                                   string const & table)
 {
+  MM(ident);
   results res;
   query q("SELECT id, name, value, keypair, signature FROM " + table +
           " WHERE id = ?");
@@ -3237,6 +3238,7 @@ database_impl::get_certs(id const & iden
                          vector<cert> & certs,
                          string const & table)
 {
+  MM(ident);
   results res;
   query q("SELECT revision_id, name, value, keypair_id, signature FROM " + table +
           " WHERE revision_id = ?");
@@ -3250,6 +3252,7 @@ database_impl::get_certs(cert_name const
                          vector<cert> & certs,
                          string const & table)
 {
+  MM(name);
   results res;
   query q("SELECT revision_id, name, value, keypair_id, signature FROM " + table +
           " WHERE name = ?");
@@ -3470,7 +3473,7 @@ database::get_revision_cert(id const & h
   results res;
   vector<cert> certs;
   imp->fetch(res, 5, one_row,
-             query("SELECT revision_id, name, value, keypair, signature "
+             query("SELECT revision_id, name, value, keypair_id, signature "
                    "FROM revision_certs "
                    "WHERE hash = ?")
              % blob(hash()));
============================================================
--- project.cc	9420c864da2224b567dd700699a3d9b81e4aa30d
+++ project.cc	5b12a35283e894b9db1b6549cf2afac4f1cb6097
@@ -475,9 +475,9 @@ project_t::lookup_key_by_name(key_store 
             }
         }
       E(!found.empty(), origin::user,
-        F("you don't have a key names '%s'") % name);
+        F("there is no key named '%s'") % name);
       E(found.size() == 1, origin::user,
-        F("you have %n keys named '%s'") % found.size() % name);
+        F("there are %n keys named '%s'") % found.size() % name);
       id = *found.begin();
     }
 }
============================================================
--- tests/drop_a_public_and_private_key/__driver__.lua	2157acce39fb10e5d2144ef8bfd419e3c83ffb89
+++ tests/drop_a_public_and_private_key/__driver__.lua	1216e79a802889c3ebcdf3d532ebc4f7d55a1363
@@ -11,8 +11,8 @@ check(mtn("privkey", "address@hidden"), 1,
 
 check(mtn("privkey", "address@hidden"), 1, false, true)
 
-check(qgrep('do not exist', "stderr"))
+check(qgrep('no_key_named', "stderr"))
 
 check(mtn("pubkey", "address@hidden"), 1, false, true)
 
-check(qgrep('does not exist', "stderr"))
+check(qgrep('no key named', "stderr"))
============================================================
--- tests/drop_a_public_key/__driver__.lua	ad6647be940a3cc1359b858c56c164f234f82059
+++ tests/drop_a_public_key/__driver__.lua	d61b77d1e87913a617e6a29cad5a3906c7a20fb0
@@ -13,4 +13,4 @@ check(mtn("pubkey", "address@hidden"), 1, 
 
 check(mtn("pubkey", "address@hidden"), 1, false, true)
 
-check(qgrep('does not exist', "stderr"))
+check(qgrep('no key named', "stderr"))