4 commits

Author	SHA1	Message	Date
Sergei Golubchik	e246077bcf	rename maria to aria	2010-09-12 18:40:01 +02:00
Guilhem Bichot	704b4845aa	merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. ... There were so many changes into mtr (this is the new mtr coming) that I rather copied mtr from 6.0-main here (at least this one knows how to run Maria tests). I also fixed suite/maria tests to be accepted by the new mtr. mysys/thr_mutex.c: adding DBUG_PRINT here, so that we can locate where the warning is issued.	2009-02-12 15:08:56 +01:00
Guilhem Bichot	45521d9710	Fix for pushbuild failure (test which can't run in embedded mode) and compiler warning ... mysql-test/suite/maria/t/maria_showlog_error.test: test which can't run in embedded mode storage/innobase/handler/ha_innodb.cc: compiler warning	2008-12-05 10:15:23 +01:00
unknown	2b51150231	Do not use MY_WME in the stat call which errors we process on high level. ... (BUG#41127: Maria: assertion when SHOW ENGINE MARIA LOGS and missing logs) mysql-test/suite/maria/r/maria_showlog_error.result: test suite for the BUG#41127 mysql-test/suite/maria/t/maria_showlog_error.test: test suite for the BUG#41127 storage/maria/ha_maria.cc: Do not use MY_WME in the stat call which errors we process on high level.	2008-12-01 15:21:37 +02:00