Hi Sergei and everyone, MariaDB defines ER_LOCK_WAIT_TIMEOUT as share/errmsg-utf8.txt: eng "Lock wait timeout exceeded; try restarting transaction" facebook/mysql-5.6 has an enhancement: it also shows what kind of lock is held: share/errmsg-utf8.txt: eng "Lock wait timeout exceeded; try restarting transaction: %-.256s" the new error messages have more info and look like this: https://gist.github.com/spetrunia/266272c384a1b43081572e1ba2baf3f3 note that MyRocks also provides extra information. So, the questions are: - Is it (generally) possible to change error message texts in 10.2 still? - Can/should we change the ER_LOCK_WAIT_TIMEOUT error text? - (non-question) I assume that adding another error code with the new error text is not a good solution: two error codes for the same error will be very confusing. The number of times ER_LOCK_WAIT_TIMEOUT is used in the source is actually quite small: https://gist.github.com/spetrunia/2bc2ed7040a930d75b39162becbc7963 (25 occurences, and most of them actually dont care about the error message). There are lots of .result files to update, though. Any opinions? BR Sergei -- Sergei Petrunia, Software Developer MariaDB Corporation | Skype: sergefp | Blog: http://s.petrunia.net/blog