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

Merging 5.1 main into 5.1-rpl

2008-10-23 21:27:09 +02:00

my.cnf

WL#4189

2007-12-12 18:19:24 +01:00