Michael Widenius
1d72603832
Merge; No notable changes
.bzr-mysql/default.conf:
Automatic merge
config/ac-macros/plugins.m4:
Automatic merge
configure.in:
Automatic merge
include/my_global.h:
Automatic merge
mysql-test/include/maria_empty_logs.inc:
Use Guilmhems version, but don't echo use database
mysql-test/r/maria-no-logging.result:
Automatic merge
mysql-test/r/maria-page-checksum.result:
Automatic merge
mysql-test/r/maria-recover.result:
Automatic merge
mysql-test/r/maria2.result:
Automatic merge
mysql-test/t/maria-no-logging.test:
Automatic merge
mysql-test/t/maria-page-checksum.test:
Automatic merge
mysql-test/t/maria-purge.test:
Automatic merge
mysql-test/t/maria-recover.test:
Automatic merge
mysql-test/t/maria2.test:
Automatic merge
sql/sql_table.cc:
Automatic merge
storage/maria/CMakeLists.txt:
Automatic merge
storage/maria/ma_ft_parser.c:
Automatic merge
storage/maria/ma_loghandler.c:
Automatic merge
storage/maria/ma_recovery.c:
Automatic merge
storage/maria/ma_rt_test.c:
Manual merge
storage/maria/ma_state.c:
Automatic merge
storage/maria/ma_test_force_start.pl:
Automatic merge
storage/maria/plug.in:
Automatic merge
storage/maria/unittest/CMakeLists.txt:
Automatic merge
storage/maria/unittest/Makefile.am:
Automatic merge
storage/maria/unittest/ma_test_all-t:
Automatic merge
storage/maria/unittest/ma_test_loghandler_multithread-t.c:
Automatic merge
storage/maria/unittest/ma_test_recovery.pl:
Automatic merge
storage/myisam/rt_test.c:
Automatic merge