merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.

Browse Source

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.

...

This commit is contained in:

Guilhem Bichot

2009-02-12 15:08:56 +01:00

parent 2637dda668 a5e5b0180a

commit 704b4845aa

1658 changed files with 37656 additions and 20494 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

6838

mysql-test/mysql-test-run.pl

File diff suppressed because it is too large Load Diff