• unknown's avatar
    Merge latest XtraDB from lp:percona-xtradb into MariaDB. · 93bcda59
    unknown authored
    
    include/my_sys.h:
      Move generic file parsing functions out to shared code, as they are used in several places.
    mysys/mf_iocache2.c:
      Move generic file parsing functions out to shared code, as they are used in several places.
    sql/log_event.cc:
      Fix XtraDB build with embedded server.
      XtraDB needs access to replication stuff, which is missing in embedded server.
      Solved by defining wrapper function for this which is compiled differently for normal and
      embedded case.
    sql/log_event.h:
      Fix XtraDB build with embedded server.
      XtraDB needs access to replication stuff, which is missing in embedded server.
      Solved by defining wrapper function for this which is compiled differently for normal and
      embedded case.
    sql/slave.cc:
      Move generic file parsing functions out to shared code, as they are used in several places.
    93bcda59
sync0rw.ic 19 KB