mysql-test/r/information_schema.result:
Fixed a result file.
mysql-test/r/innodb-autoinc.result:
Fixed a result file.
mysql-test/t/connect.test:
Fixed a problem with merge, needed to close
connections and use the default
mysql-test/mysql-test-run.pl:
Fixed missed lines in merge.
storage/maria/plug.in:
Fixed problem with configuration. This is now included
top level.
storage/pbxt/plug.in:
Fixed problem with configuration. This is
included now in top level.