mysys/mf_loadpath.c · 5ef2bdea81a68a5440235bb5c841fff5dcc2b2c7 · Kirill Smelkov / mariadb

Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. · 5ef2bdea

Alexey Kopytov authored May 09, 2010

Conflicts:

Text conflict in mysql-test/r/grant.result
Text conflict in mysql-test/t/grant.test
Text conflict in mysys/mf_loadpath.c
Text conflict in sql/slave.cc
Text conflict in sql/sql_priv.h

5ef2bdea

mf_loadpath.c 2.03 KB

Replace mf_loadpath.c