Merge with internal version

- Fix problems with double definitions
- Clean up a bit a type mess - 4 types less. No need to have aliases
for the same thing (unification is the name).
- New macro for Johannes mysqln

- Fix problems with double definitions
- Clean up a bit a type mess - 4 types less. No need to have aliases
for the same thing (unification is the name).
- New macro for Johannes mysqlnd_stmt_ro_result_metadata

show more ...

MFH: Bump copyright year, 2 of 2.

Import mysqlnd
Patch ext/mysql and ext/mysqli to support mysqlnd