Skip to content
Permalink
Browse files

MariaRocks port: provide timeout_message()

Also, ER_LOCK_WAIT_TIMEOUT error doesn't have a string parameter
in MariaDB.
  • Loading branch information...
spetrunia committed Oct 21, 2016
1 parent 8c5912e commit 86d963eb0888cb7f608a9185116c38de8310f7a6
Showing with 21 additions and 0 deletions.
  1. +21 −0 storage/rocksdb/ha_rocksdb.cc
@@ -1430,6 +1430,27 @@ class Rdb_snapshot_notifier : public rocksdb::TransactionNotifier
}
};


#ifdef MARIAROCKS_NOT_YET
// ER_LOCK_WAIT_TIMEOUT error also has a reason in facebook/mysql-5.6
#endif
String timeout_message(const char *command, const char *name1,
const char *name2)
{
String msg;
msg.append("Timeout on ");
msg.append(command);
msg.append(": ");
msg.append(name1);
if (name2 && name2[0])
{
msg.append(".");
msg.append(name2);
}
return msg;
}


/* This is the base class for transactions when interacting with rocksdb.
*/
class Rdb_transaction

0 comments on commit 86d963e

Please sign in to comment.
You can’t perform that action at this time.