• unknown's avatar
    XtraDB after-merge fix: Fix building from storage/xtradb/ instead of storage/innodb/ · 8be051d7
    unknown authored
    .bzrignore:
      XtraDB compiles innodb in storage/xtradb instead of storage/innobase
    CMakeLists.txt:
      Take InnoDB code from storage/xtradb/ instead of storage/innobase/
    libmysqld/CMakeLists.txt:
      Take InnoDB code from storage/xtradb/ instead of storage/innobase/
    storage/innobase/plug.in.disabled:
      Disable building old InnoDB from storage/innobase/ directory.
      
      We will keep the files around to avoid getting merge conflicts for every MySQL upstream
      change to InnoDB.
    storage/xtradb/CMakeLists.txt:
      Take InnoDB code from storage/xtradb/ instead of storage/innobase/
    storage/xtradb/COPYING:
      Remove not needed file from XtraDB.
    storage/xtradb/Makefile.am:
      Take InnoDB code from storage/xtradb/ instead of storage/innobase/
    storage/xtradb/Makefile.in:
      Remove not needed file from XtraDB.
    storage/xtradb/handler/ha_innodb.cc:
      Take InnoDB code from storage/xtradb/ instead of storage/innobase/
    storage/xtradb/plug.in:
      Take InnoDB code from storage/xtradb/ instead of storage/innobase/
    storage/xtradb/row/row0ins.c:
      Take InnoDB code from storage/xtradb/ instead of storage/innobase/
    8be051d7
ha_innodb.cc 288 KB