into  xiphis.org:/anubis/antony/work/p1-bug34598.2.merge.maria


include/mysql/plugin.h:
  Auto merged
sql/sql_plugin.cc:
  Auto merged