Andrei Elkin 2618337eb6 merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging. ... mysql_upgrade results changed due to the error messesge of mysqlcheck has changed.		2008-11-12 19:51:47 +02:00
..
r	merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging.	2008-11-12 19:51:47 +02:00
t	Merge BUG#39007	2008-11-03 16:36:38 +08:00
my.cnf	Use loose-skip-innodb so it works also with mysqld that has no innodb support	2008-01-08 10:35:34 +01:00