From 86d963eb0888cb7f608a9185116c38de8310f7a6 Mon Sep 17 00:00:00 2001
From: Sergei Petrunia <psergey@askmonty.org>
Date: Fri, 21 Oct 2016 20:05:40 +0000
Subject: [PATCH] MariaRocks port: provide timeout_message()

Also, ER_LOCK_WAIT_TIMEOUT error doesn't have a string parameter
in MariaDB.
---
 storage/rocksdb/ha_rocksdb.cc | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc
index 7f377073bd469..6f35d0f75b05f 100644
--- a/storage/rocksdb/ha_rocksdb.cc
+++ b/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