XtraDB after-merge fix: Fix building from storage/xtradb/ instead of storage/innodb/

.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/

.bzrignore

@@ -1442,6 +1442,21 @@ storage/innobase/ib_config.h
 storage/innobase/ib_config.h.in
 storage/innobase/mkinstalldirs
 storage/innobase/stamp-h1
+storage/xtradb/autom4te-2.53.cache/*
+storage/xtradb/autom4te-2.53.cache/output.0
+storage/xtradb/autom4te-2.53.cache/requests
+storage/xtradb/autom4te-2.53.cache/traces.0
+storage/xtradb/autom4te.cache/*
+storage/xtradb/autom4te.cache/output.0
+storage/xtradb/autom4te.cache/requests
+storage/xtradb/autom4te.cache/traces.0
+storage/xtradb/configure.lineno
+storage/xtradb/conftest.s1
+storage/xtradb/conftest.subs
+storage/xtradb/ib_config.h
+storage/xtradb/ib_config.h.in
+storage/xtradb/mkinstalldirs
+storage/xtradb/stamp-h1
 storage/maria/*.MAD
 storage/maria/*.MAI
 storage/maria/ma_rt_test

CMakeLists.txt

@@ -257,7 +257,7 @@ IF(WITH_FEDERATED_STORAGE_ENGINE)
   ADD_SUBDIRECTORY(storage/federated)
 ENDIF(WITH_FEDERATED_STORAGE_ENGINE)
 IF(WITH_INNOBASE_STORAGE_ENGINE)
-  ADD_SUBDIRECTORY(storage/innobase)
+  ADD_SUBDIRECTORY(storage/xtradb)
 ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
 IF(WITH_MARIA_STORAGE_ENGINE)
   ADD_SUBDIRECTORY(storage/maria)

libmysqld/CMakeLists.txt

@@ -132,9 +132,9 @@ IF(WITH_FEDERATED_STORAGE_ENGINE)
 ENDIF(WITH_FEDERATED_STORAGE_ENGINE)
 
 IF(WITH_INNOBASE_STORAGE_ENGINE)
-  INCLUDE(${CMAKE_SOURCE_DIR}/storage/innobase/CMakeLists.txt)
+  INCLUDE(${CMAKE_SOURCE_DIR}/storage/xtradb/CMakeLists.txt)
   FOREACH(rpath ${INNOBASE_SOURCES})
-    SET(LIB_SOURCES ${LIB_SOURCES} ../storage/innobase/${rpath})
+    SET(LIB_SOURCES ${LIB_SOURCES} ../storage/xtradb/${rpath})
   ENDFOREACH(rpath)
 ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
 

storage/xtradb/CMakeLists.txt

@@ -20,14 +20,14 @@ ADD_DEFINITIONS(-D_WIN32 -D_LIB)
 # Bug 19424 - InnoDB: Possibly a memory overrun of the buffer being freed (64-bit Visual C)
 # Removing Win64 compiler optimizations for all innodb/mem/* files.
 IF(CMAKE_GENERATOR MATCHES "Visual Studio" AND CMAKE_SIZEOF_VOID_P MATCHES 8)
-  SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/storage/innobase/mem/mem0mem.c
-                              ${CMAKE_SOURCE_DIR}/storage/innobase/mem/mem0pool.c
+  SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/storage/xtradb/mem/mem0mem.c
+                              ${CMAKE_SOURCE_DIR}/storage/xtradb/mem/mem0pool.c
                               PROPERTIES COMPILE_FLAGS -Od)
 ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio" AND CMAKE_SIZEOF_VOID_P MATCHES 8)
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib
-                    ${CMAKE_SOURCE_DIR}/storage/innobase/include
-                    ${CMAKE_SOURCE_DIR}/storage/innobase/handler
+                    ${CMAKE_SOURCE_DIR}/storage/xtradb/include
+                    ${CMAKE_SOURCE_DIR}/storage/xtradb/handler
                     ${CMAKE_SOURCE_DIR}/sql
                     ${CMAKE_SOURCE_DIR}/regex
                     ${CMAKE_SOURCE_DIR}/extra/yassl/include)

storage/xtradb/Makefile.am

@@ -22,7 +22,7 @@ MYSQLLIBdir=		$(pkglibdir)
 pkgplugindir=		$(pkglibdir)/plugin
 INCLUDES=		-I$(top_srcdir)/include -I$(top_builddir)/include \
 			-I$(top_srcdir)/regex \
-			-I$(top_srcdir)/storage/innobase/include \
+			-I$(top_srcdir)/storage/xtradb/include \
 			-I$(top_srcdir)/sql \
 			-I$(srcdir)
 

storage/xtradb/handler/ha_innodb.cc

@@ -43,35 +43,35 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 
 /* Include necessary InnoDB headers */
 extern "C" {
-#include "../storage/innobase/include/univ.i"
-#include "../storage/innobase/include/btr0sea.h"
-#include "../storage/innobase/include/os0file.h"
-#include "../storage/innobase/include/os0thread.h"
-#include "../storage/innobase/include/srv0start.h"
-#include "../storage/innobase/include/srv0srv.h"
-#include "../storage/innobase/include/trx0roll.h"
-#include "../storage/innobase/include/trx0trx.h"
-#include "../storage/innobase/include/trx0sys.h"
-#include "../storage/innobase/include/mtr0mtr.h"
-#include "../storage/innobase/include/row0ins.h"
-#include "../storage/innobase/include/row0mysql.h"
-#include "../storage/innobase/include/row0sel.h"
-#include "../storage/innobase/include/row0upd.h"
-#include "../storage/innobase/include/log0log.h"
-#include "../storage/innobase/include/lock0lock.h"
-#include "../storage/innobase/include/dict0crea.h"
-#include "../storage/innobase/include/btr0cur.h"
-#include "../storage/innobase/include/btr0btr.h"
-#include "../storage/innobase/include/fsp0fsp.h"
-#include "../storage/innobase/include/sync0sync.h"
-#include "../storage/innobase/include/fil0fil.h"
-#include "../storage/innobase/include/trx0xa.h"
-#include "../storage/innobase/include/row0merge.h"
-#include "../storage/innobase/include/thr0loc.h"
-#include "../storage/innobase/include/dict0boot.h"
-#include "../storage/innobase/include/ha_prototypes.h"
-#include "../storage/innobase/include/ut0mem.h"
-#include "../storage/innobase/include/ibuf0ibuf.h"
+#include "../storage/xtradb/include/univ.i"
+#include "../storage/xtradb/include/btr0sea.h"
+#include "../storage/xtradb/include/os0file.h"
+#include "../storage/xtradb/include/os0thread.h"
+#include "../storage/xtradb/include/srv0start.h"
+#include "../storage/xtradb/include/srv0srv.h"
+#include "../storage/xtradb/include/trx0roll.h"
+#include "../storage/xtradb/include/trx0trx.h"
+#include "../storage/xtradb/include/trx0sys.h"
+#include "../storage/xtradb/include/mtr0mtr.h"
+#include "../storage/xtradb/include/row0ins.h"
+#include "../storage/xtradb/include/row0mysql.h"
+#include "../storage/xtradb/include/row0sel.h"
+#include "../storage/xtradb/include/row0upd.h"
+#include "../storage/xtradb/include/log0log.h"
+#include "../storage/xtradb/include/lock0lock.h"
+#include "../storage/xtradb/include/dict0crea.h"
+#include "../storage/xtradb/include/btr0cur.h"
+#include "../storage/xtradb/include/btr0btr.h"
+#include "../storage/xtradb/include/fsp0fsp.h"
+#include "../storage/xtradb/include/sync0sync.h"
+#include "../storage/xtradb/include/fil0fil.h"
+#include "../storage/xtradb/include/trx0xa.h"
+#include "../storage/xtradb/include/row0merge.h"
+#include "../storage/xtradb/include/thr0loc.h"
+#include "../storage/xtradb/include/dict0boot.h"
+#include "../storage/xtradb/include/ha_prototypes.h"
+#include "../storage/xtradb/include/ut0mem.h"
+#include "../storage/xtradb/include/ibuf0ibuf.h"
 }
 
 #include "ha_innodb.h"
@@ -1587,7 +1587,7 @@ innobase_query_caching_of_table_permitted(
 /*********************************************************************
 Invalidates the MySQL query cache for the table.
 NOTE that the exact prototype of this function has to be in
-/innobase/row/row0ins.c! */
+/xtradb/row/row0ins.c! */
 extern "C" UNIV_INTERN
 void
 innobase_invalidate_query_cache(

storage/xtradb/plug.in

@@ -16,7 +16,7 @@
 
 MYSQL_STORAGE_ENGINE(innobase,  innodb, [InnoDB Storage Engine],
         [Transactional Tables using InnoDB], [max,max-no-ndb])
-MYSQL_PLUGIN_DIRECTORY(innobase, [storage/innobase])
+MYSQL_PLUGIN_DIRECTORY(innobase, [storage/xtradb])
 MYSQL_PLUGIN_STATIC(innobase,   [libinnobase.a])
 MYSQL_PLUGIN_DYNAMIC(innobase,  [ha_innodb.la])
 MYSQL_PLUGIN_ACTIONS(innobase,  [

storage/xtradb/row/row0ins.c

@@ -54,7 +54,7 @@ Created 4/20/1996 Heikki Tuuri
 This prototype is copied from /mysql/sql/ha_innodb.cc.
 Invalidates the MySQL query cache for the table.
 NOTE that the exact prototype of this function has to be in
-/innobase/row/row0ins.c! */
+/xtradb/row/row0ins.c! */
 extern
 void
 innobase_invalidate_query_cache(