- When the table is created with an attribute that is not supported by
  the storage engine, the attribute ought to be still kept.

Make it not to add '--console' when '--log-error' option is present
- Review feedback

Fixed a failure of the merge_innodb test on windows.


storage/myisammrg/ha_myisammrg.cc:
  Fixed a failure of the merge_innodb test on windows.

Bug #46212 safe_process: FATAL ERROR, Unknown option: --nocore
Also fixed mysqld.cc to avoid popup-boxes

- Make it not to add '--console' when '--log-error' option is present

include/my_global.h:
  MWL#17: Table elimination: fixes for windows
  - Add ALIGN_MAX_UNIT (assume malloc returns data aligned to this much)
mysql-test/r/table_elim.result:
  MWL#17: Table elimination: fixes for windows
  - Use only lower-case as EXPLAIN [EXTENDED] changes case of table names
    on windows
mysql-test/t/table_elim.test:
  MWL#17: Table elimination: fixes for windows
  - Use only lower-case as EXPLAIN [EXTENDED] changes case of table names
    on windows
sql/opt_table_elimination.cc:
  MWL#17: Table elimination: fixes for windows
  - Add extra alignment-padding-space for stack-allocated buffers.

 after the table has been converted to MyISAM and back. (PAGE_CHECKSUM is
 still there)

mysql-test/suite/maria/r/maria3.result:
  Update tests results after previous cset. 'TRANSACTIONAL=1' attribute goes 
  after the table has been converted to MyISAM and back. (PAGE_CHECKSUM is 
  still there)

Temporarily silence test failure due to MBug#430669 in test case introduced from
MySQL 5.1.38.

if the storage engine doesn't support transactions.

- Fix XtraDB to be built as a static library.

storage/xtradb/buf/buf0flu.c:
  Fix previous merge error (was harmless except for on win32)
storage/xtradb/plug.in:
  Make it sync with innobase/plug.in.disabled

mysql-test/t/mysqldump.test:
  Make test case work when build directory is not world readable
  (this is the case for Buildbot checkouts).
mysys/my_getopt.c:
  Restore bugfix which was lost in previous merge.
storage/xtradb/buf/buf0flu.c:
  Fix extranous line caused by bad merge.

Merge remaining bits of mysql-5.1.38 into MariaDB (9 commits were missing
from the original merge).

Fix version number (we are based on 5.1.38, not 5.1.39).
Fix mistaken translation in error message.

mysql-test/include/concurrent.inc:
  Merge

Fix some mistakes in the original merge found during review.

mysql-test/include/concurrent.inc:
  Add missing lines mistakenly omitted in merge.
mysql-test/include/mix1.inc:
  Revert wrong change done during merge.
mysql-test/include/wait_for_status_var.inc.moved:
  Remove file which was accidentally not removed during conflict resolution in merge.
mysql-test/r/innodb_mysql.result:
  Revert result file change following fixing root problem in merge.

- fix xtradb compile failures on windows (why do we have to do it again?)

conflict every time they make a change)

InnoDB does not bother to free explicitly one-time allocations at exit, so we get lots of
"still reachable" warnings in Valgrind with innodb-use-sys-malloc enabled.

Due to a bugfix for enum options in MariaDB, my_getopt parses enums into an ulong.
However, some new code from MySQL was written to assume enums take an uint.

Fix by using the correct type.

(The new MySQL code in addition had an implicit assumption that my_bool and uint were
compatible; remove this assumption).

mysql-test/r/innodb.result:
  Fix wrong merge of result file conflicts.
mysql-test/t/bug46080-master.opt:
  Fix memory limit to take into account extra storage engines in MariaDB.
mysql-test/t/innodb.test:
  Add comment clarifying tricky --replace_result.
sql/sql_select.cc:
  Restore fix of Bug#34374, accudentally lost during MySQL 5.1.38 merge.
support-files/build-tags:
  Fix missing -R option for bzr, accidentally lost in MySQL-5.1.38 merge.

from the default build. We have xtradb instead.

- Don't follow mainline on use of UNINIT_VAR yet, we haven't merged it in.

- Post-merge fixes

* Finished Monty and Jani's merge
* Some InnoDB tests still fail (because it's old xtradb code run against
  newer testsuite). They are expected to go after mergning with the latest
  xtradb.

(also fixes a Valgrind warning in Buildbot).

 - PBXT fixes.
 - MBug#423035 fix.
 - Compiler warning fixes.

 - Silence a compiler warning.
 - Don't build pbms object files now that we disabled pbms.


storage/pbxt/src/Makefile.am:
  We disabled PBMS, so don't build it.
storage/pbxt/src/datalog_xt.cc:
  Silence a warning about signed/unsigned comparison.