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.

1 files changed, 0 insertions, 258 deletions

diff --git a/mysql-test/include/collation_basic.inc b/mysql-test/include/collation_basic.inc
deleted file mode 100644
index be8ae36eeb8..00000000000
--- a/mysql-test/include/collation_basic.inc
+++ /dev/null
@@ -1,258 +0,0 @@
-#
-# This auxiliary file is used by collation variables
-#
---Error 0,ER_UNKNOWN_CHARACTER_SET
-eval SET $collation_variable = big5_chinese_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = big5_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = dec8_swedish_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = dec8_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = cp850_general_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = cp850_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = hp8_english_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = hp8_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = koi8r_general_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = koi8r_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = latin1_german1_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = latin1_swedish_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = latin1_danish_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = latin1_german2_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = latin1_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = latin1_general_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = latin1_general_cs;
-eval SELECT $collation_variable;
-eval SET $collation_variable = latin1_spanish_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = latin2_czech_cs;
-eval SELECT $collation_variable;
-eval SET $collation_variable = latin2_general_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = latin2_hungarian_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = latin2_croatian_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = latin2_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = swe7_swedish_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = swe7_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ascii_general_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ascii_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ujis_japanese_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ujis_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = sjis_japanese_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = sjis_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = hebrew_general_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = hebrew_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = tis620_thai_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = tis620_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = euckr_korean_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = euckr_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = koi8u_general_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = koi8u_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = gb2312_chinese_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = gb2312_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = greek_general_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = greek_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = cp1250_general_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = cp1250_czech_cs;
-eval SELECT $collation_variable;
-eval SET $collation_variable = cp1250_croatian_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = cp1250_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = cp1250_polish_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = gbk_chinese_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = gbk_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = latin5_turkish_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = latin5_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = armscii8_general_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = armscii8_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = utf8_general_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = utf8_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = utf8_unicode_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = utf8_icelandic_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = utf8_latvian_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = utf8_romanian_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = utf8_slovenian_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = utf8_polish_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = utf8_estonian_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = utf8_spanish_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = utf8_swedish_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = utf8_turkish_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = utf8_czech_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = utf8_danish_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = utf8_lithuanian_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = utf8_slovak_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = utf8_spanish2_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = utf8_roman_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = utf8_persian_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = utf8_esperanto_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = utf8_hungarian_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ucs2_general_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ucs2_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ucs2_unicode_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ucs2_icelandic_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ucs2_latvian_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ucs2_romanian_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ucs2_slovenian_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ucs2_polish_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ucs2_estonian_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ucs2_spanish_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ucs2_swedish_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ucs2_turkish_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ucs2_czech_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ucs2_danish_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ucs2_lithuanian_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ucs2_slovak_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ucs2_spanish2_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ucs2_roman_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ucs2_persian_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ucs2_esperanto_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = ucs2_hungarian_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = cp866_general_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = cp866_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = keybcs2_general_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = keybcs2_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = macce_general_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = macce_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = macroman_general_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = macroman_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = cp852_general_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = cp852_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = latin7_estonian_cs;
-eval SELECT $collation_variable;
-eval SET $collation_variable = latin7_general_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = latin7_general_cs;
-eval SELECT $collation_variable;
-eval SET $collation_variable = latin7_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = cp1251_bulgarian_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = cp1251_ukrainian_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = cp1251_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = cp1251_general_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = cp1251_general_cs;
-eval SELECT $collation_variable;
-eval SET $collation_variable = cp1256_general_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = cp1256_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = cp1257_lithuanian_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = cp1257_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = cp1257_general_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = binary;
-eval SELECT $collation_variable;
-eval SET $collation_variable = geostd8_general_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = geostd8_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = cp932_japanese_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = cp932_bin;
-eval SELECT $collation_variable;
-eval SET $collation_variable = eucjpms_japanese_ci;
-eval SELECT $collation_variable;
-eval SET $collation_variable = eucjpms_bin;
-eval SELECT $collation_variable;