sync with extensions-1.0

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/xtradb/mem/mem0mem.c
-                              ${CMAKE_SOURCE_DIR}/storage/xtradb/mem/mem0pool.c
+  SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/storage/innobase/mem/mem0mem.c
+                              ${CMAKE_SOURCE_DIR}/storage/innobase/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/xtradb/include
-                    ${CMAKE_SOURCE_DIR}/storage/xtradb/handler
+                    ${CMAKE_SOURCE_DIR}/storage/innobase/include
+                    ${CMAKE_SOURCE_DIR}/storage/innobase/handler
                     ${CMAKE_SOURCE_DIR}/sql
                     ${CMAKE_SOURCE_DIR}/regex
                     ${CMAKE_SOURCE_DIR}/extra/yassl/include)

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/xtradb/include \
+			-I$(top_srcdir)/storage/innobase/include \
 			-I$(top_srcdir)/sql \
 			-I$(srcdir)
 

handler/ha_innodb.cc

@@ -53,35 +53,35 @@ int init_strvar_from_file(char *var, int max_size, IO_CACHE *f,
 
 /* Include necessary InnoDB headers */
 extern "C" {
-#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 "../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 "ha_innodb.h"

include/univ.i

@@ -35,7 +35,7 @@ Created 1/20/1994 Heikki Tuuri
 #define INNODB_VERSION_MAJOR	1
 #define INNODB_VERSION_MINOR	0
 #define INNODB_VERSION_BUGFIX	3
-#define PERCONA_INNODB_VERSION	5a
+#define PERCONA_INNODB_VERSION	6a
 
 /* The following is the InnoDB version as shown in
 SELECT plugin_version FROM information_schema.plugins;

mysql-test/innodb-analyze.test

@@ -11,6 +11,7 @@
 -- disable_result_log
 -- enable_warnings
 
+SET @old_innodb_stats_sample_pages=@@innodb_stats_sample_pages;
 SET GLOBAL innodb_stats_sample_pages=0;
 
 # check that the value has been adjusted to 1
@@ -61,3 +62,4 @@ SET GLOBAL innodb_stats_sample_pages=16;
 ANALYZE TABLE innodb_analyze;
 
 DROP TABLE innodb_analyze;
+SET GLOBAL innodb_stats_sample_pages=@old_innodb_stats_sample_pages;

mysql-test/innodb_xtradb_bug317074.result

+SET @old_innodb_file_format=@@innodb_file_format;
+SET @old_innodb_file_per_table=@@innodb_file_per_table;
+SET @old_innodb_file_format_check=@@innodb_file_format_check;
 SET GLOBAL innodb_file_format='Barracuda';
 SET GLOBAL innodb_file_per_table=ON;

mysql-test/innodb_xtradb_bug317074.test

 -- source include/have_innodb.inc
 
+SET @old_innodb_file_format=@@innodb_file_format;
+SET @old_innodb_file_per_table=@@innodb_file_per_table;
+SET @old_innodb_file_format_check=@@innodb_file_format_check;
 SET GLOBAL innodb_file_format='Barracuda';
 SET GLOBAL innodb_file_per_table=ON;
 
@@ -36,3 +39,6 @@ DROP PROCEDURE insert_many;
 ALTER TABLE test1 ENGINE=MyISAM;
 
 DROP TABLE test1;
+SET GLOBAL innodb_file_format=@old_innodb_file_format;
+SET GLOBAL innodb_file_per_table=@old_innodb_file_per_table;
+SET GLOBAL innodb_file_format_check=@old_innodb_file_format_check;

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/xtradb])
+MYSQL_PLUGIN_DIRECTORY(innobase, [storage/innobase])
 MYSQL_PLUGIN_STATIC(innobase,   [libinnobase.a])
 MYSQL_PLUGIN_DYNAMIC(innobase,  [ha_innodb.la])
 MYSQL_PLUGIN_ACTIONS(innobase,  [

setup.sh

@@ -21,7 +21,7 @@
 
 set -eu
 
-TARGETDIR=../storage/xtradb
+TARGETDIR=../storage/innobase
 
 # link the build scripts
 BUILDSCRIPTS="compile-innodb compile-innodb-debug"
@@ -40,8 +40,8 @@ ln -sf ../$TARGETDIR/mysql-test/*.inc .
 # These patches are usually needed because of deviations of behavior between
 # the stock InnoDB and the InnoDB Plugin.
 cd ../..
-for patch in storage/xtradb/mysql-test/patches/*.diff ; do
-	if [ "${patch}" != "storage/xtradb/mysql-test/patches/*.diff" ] ; then
+for patch in storage/innobase/mysql-test/patches/*.diff ; do
+	if [ "${patch}" != "storage/innobase/mysql-test/patches/*.diff" ] ; then
 		patch -p0 < ${patch}
 	fi
 done