Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.

Also merge charset patch.
This commit is contained in:
unknown 2009-11-30 22:37:27 +01:00
commit db260b19e3
570 changed files with 21024 additions and 5466 deletions

View file

@ -1,4 +1,5 @@
set @old_innodb_file_format=@@innodb_file_format;
call mtr.add_suppression("InnoDB: invalid innodb_file_format_check value");
select @@innodb_file_format;
@@innodb_file_format
Antelope