instead of making it experimental.

Remove the extra line which try to use the name INNOBASE again. The IF ELSE
loop above declares the library name based on the version of mysql

push_warning(MYSQL_ERROR::WARN_LEVEL_ERROR)).

The Signal/Resignal patch changes the push_warning() API: now
it silently downgrades WARN_LEVEL_ERROR to WARN_LEVEL_WARN.

This patch should be rolled back when Bug#47233 is fixed.

use function prototypes from header in conjunction with K&R-style
function definitions.  The symptom is a type mismatch between
int and wchar_t.

Use "#ifdef", not plain "#if".

also merged missing Innodb plugin revisions r5636,r5635 manually