Plus compiler warnings, and a fix to the pagecache unit tests for IA64
include/maria.h:
merging MyISAM into Maria
include/myisam.h:
post-merge fixes
mysql-test/r/maria.result:
merging MyISAM into Maria
mysql-test/t/maria.test:
merging MyISAM into Maria
sql/mysqld.cc:
post-merge fixes
storage/maria/ha_maria.cc:
merging MyISAM into Maria
storage/maria/ha_maria.h:
merging MyISAM into Maria
storage/maria/ma_check.c:
merging MyISAM into Maria
storage/maria/ma_open.c:
merging MyISAM into Maria
storage/maria/ma_packrec.c:
merging MyISAM into Maria
storage/maria/ma_range.c:
merging MyISAM into Maria
storage/maria/ma_sort.c:
merging MyISAM into Maria
storage/maria/maria_def.h:
merging MyISAM into Maria
storage/maria/maria_pack.c:
merging MyISAM into Maria
storage/maria/plug.in:
merging MyISAM into Maria
storage/myisam/myisamdef.h:
merging MyISAM into Maria
storage/myisam/myisampack.c:
fix for compiler warnings
unittest/mysys/mf_pagecache_consist.c:
this sets the stack size lower than the minimum on IA64, we remove it
(it made the test fail)
unittest/mysys/mf_pagecache_single.c:
this sets the stack size lower than the minimum on IA64, we remove it
(it made the test fail)
last round of fixes to the storage engines' and plugins' unit tests
structure. Will extract a total patch and push it in 5.1 as has been
approved.
Makefile.am:
unittest must be before storage and plugin, because engine and plugin
may have unit tests which link with libtap which is found in
unitttest.
config/ac-macros/plugins.m4:
When enabling an engine/plugin, add its directory to the list
of directories where unit tests should be searched. That is,
its directory will be recursively searched by our unit test framework
which will execute any executable *-t file.
storage/maria/ma_control_file.c:
those my_message pollute the output of unit tests.
storage/maria/plug.in:
When Maria is enabled, add its unittest Makefile.
unittest/Makefile.am:
plugins too
storage/maria/ft_maria.c:
Rename: BitKeeper/deleted/.del-ft_maria.c -> storage/maria/ft_maria.c
configure.in:
maria moves to its plug.in
storage/maria/Makefile.am:
merging changes made to MyISAM into Maria.
ft_maria.c is still needed.
storage/maria/ha_maria.cc:
merging changes made to MyISAM into Maria
storage/maria/ma_dynrec.c:
merging changes made to MyISAM into Maria
storage/maria/ma_extra.c:
merging changes made to MyISAM into Maria
storage/maria/ma_ft_parser.c:
merging changes made to MyISAM into Maria
storage/maria/ma_open.c:
merging changes made to MyISAM into Maria
storage/maria/ma_sort.c:
merging changes made to MyISAM into Maria
storage/maria/ma_update.c:
merging changes made to MyISAM into Maria
storage/maria/ma_write.c:
merging changes made to MyISAM into Maria
storage/maria/maria_def.h:
merging changes made to MyISAM into Maria
storage/myisam/Makefile.am:
merging changes made to MyISAM into Maria
storage/maria/plug.in:
merging changes made to MyISAM into Maria
