~ubuntu-branches/ubuntu/saucy/resiprocate/saucy-proposed

« back to all changes in this revision

Viewing changes to repro/MySqlDb.cxx

  • Committer: Package Import Robot
  • Author(s): Daniel Pocock
  • Date: 2012-08-08 15:02:03 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20120808150203-lzhbki3cqh2td7hk
Tags: 1.8.5-1
* New upstream release
* Make sure repro hashed passwords are not world readable
* Remove /var/lib/repro on purge (Closes: #675273)
* Delay in postrm in case process hasn't finished stopping
* Fix support for multiple ENUM carriers
* Fix issue with help text causing crash
* Fix clash between DIGEST and mutual TLS when used concurrently

Show diffs side-by-side

added added

removed removed

Lines of Context:
466
466
   Data escapedKey;
467
467
   if(AbstractDb::getSecondaryKey(table, pKey, pData, (void**)&secondaryKey, &secondaryKeyLen) == 0)
468
468
   {
 
469
      Data escapedSKey;
469
470
      Data sKey(Data::Share, secondaryKey, secondaryKeyLen);
470
471
      DataStream ds(command);
471
472
      ds << "REPLACE INTO " << tableName(table)
472
473
         << " SET attr='" << escapeString(pKey, escapedKey)
473
 
         << "', attr2='" << escapeString(sKey, escapedKey)
 
474
         << "', attr2='" << escapeString(sKey, escapedSKey)
474
475
         << "', value='"  << pData.base64encode()
475
476
         << "'";
476
477
   }