Merge commit '2ca1a2a68d247f5448433d2f7a6c45c64297b439'

Incorporated ARitz-Cracker's PR mysqljs#2386 "Add error codes from MySQL 8"

mysqljs#2386

Readme.md

@@ -136,7 +136,7 @@ spend more time on it (ordered by time of contribution):
   video encoding as a service, check it out)
 * [Joyent](http://www.joyent.com/)
 * [pinkbike.com](http://pinkbike.com/)
-* [Holiday Extras](http://www.holidayextras.co.uk/) (they are [hiring](http://join.holidayextras.co.uk/))
+* [Holiday Extras](https://www.holidayextras.com/) (they are [hiring](https://join.holidayextras.co.uk/))
 * [Newscope](http://newscope.com/) (they are [hiring](https://newscope.com/unternehmen/jobs/))
 
 ## Community
@@ -609,7 +609,7 @@ connection.query('SELECT * FROM `books` WHERE `author` = ?', ['David'], function
 The third form `.query(options, callback)` comes when using various advanced
 options on the query, like [escaping query values](#escaping-query-values),
 [joins with overlapping column names](#joins-with-overlapping-column-names),
-[timeouts](#timeout), and [type casting](#type-casting).
+[timeouts](#timeouts), and [type casting](#type-casting).
 
 ```js
 connection.query({