From 2bcb511072b4f38636c9e54653a419e66c5e6b89 Mon Sep 17 00:00:00 2001
From: Satya B <satya.bn@sun.com>
Date: Tue, 13 Oct 2009 12:41:42 +0530
Subject: [PATCH] Applying Innodb Plugin 1.0.5 snapshot, part 15

- Fix a typo and adjust the CMakeLists.txt
- Remove the README file as it doesn't exist in
  Innodb plugin 1.0.5
---
 storage/innodb_plugin/CMakeLists.txt | 19 ++----------------
 storage/innodb_plugin/README         | 29 ----------------------------
 2 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 storage/innodb_plugin/README

diff --git a/storage/innodb_plugin/CMakeLists.txt b/storage/innodb_plugin/CMakeLists.txt
index 1b05b5be6b9..25cd212a473 100644
--- a/storage/innodb_plugin/CMakeLists.txt
+++ b/storage/innodb_plugin/CMakeLists.txt
@@ -31,7 +31,7 @@ ENDIF (CMAKE_SIZEOF_VOID_P MATCHES 8)
 
 # Include directories under innodb_plugin
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/innodb_plugin/include
-		    ${CMAKE_SOURCE_DIR}/storage/innodfb_plugin/handler)
+		    ${CMAKE_SOURCE_DIR}/storage/innodb_plugin/handler)
 
 # Include directories under mysql
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
@@ -80,20 +80,5 @@ SET(INNODB_PLUGIN_SOURCES	btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea
 			usr/usr0sess.c
 			ut/ut0byte.c ut/ut0dbg.c ut/ut0mem.c ut/ut0rnd.c ut/ut0ut.c ut/ut0vec.c
 			ut/ut0list.c ut/ut0wqueue.c)
-ADD_DEFINITIONS(-DHAVE_WINDOWS_ATOMICS -DINNODB_RW_LOCKS_USE_ATOMICS -DIB_HAVE_PAUSE_INSTRUCTION)
+ADD_DEFINITIONS(-DHAVE_WINDOWS_ATOMICS -DIB_HAVE_PAUSE_INSTRUCTION)
 MYSQL_STORAGE_ENGINE(INNODB_PLUGIN)
-IF (MYSQL_VERSION_ID GREATER "50137")
-	IF (WITH_INNOBASE_STORAGE_ENGINE)
-		MYSQL_STORAGE_ENGINE(INNOBASE)
-	ELSE (WITH_INNOBASE_STORAGE_ENGINE)
-		SET (INNODB_SOURCES ${INNOBASE_SOURCES})
-		MYSQL_STORAGE_ENGINE(INNODB)
-	ENDIF (WITH_INNOBASE_STORAGE_ENGINE)
-ELSE (MYSQL_VERSION_ID GREATER "50137")
-	IF (NOT SOURCE_SUBLIBS)
-		ADD_DEFINITIONS(-D_WIN32 -DMYSQL_SERVER)
-		ADD_LIBRARY(innobase STATIC ${INNOBASE_SOURCES})
-		# Require mysqld_error.h, which is built as part of the GenError
-		ADD_DEPENDENCIES(innobase GenError)
-	ENDIF (NOT SOURCE_SUBLIBS)
-ENDIF (MYSQL_VERSION_ID GREATER "50137")
diff --git a/storage/innodb_plugin/README b/storage/innodb_plugin/README
deleted file mode 100644
index 075508e1ae0..00000000000
--- a/storage/innodb_plugin/README
+++ /dev/null
@@ -1,29 +0,0 @@
-This is the source of the InnoDB Plugin 1.0.5 for MySQL 5.1
-===========================================================
-
-Instructions for compiling the plugin:
---------------------------------------
-
-1. Get the latest MySQL 5.1 sources from
-   http://dev.mysql.com/downloads/mysql/5.1.html#source
-
-2. Replace the contents of the mysql-5.1.N/storage/innobase/ directory
-   with the contents of this directory.
-
-3. Optional (only necessary if you are going to run tests from the
-   mysql-test suite): cd into the innobase directory and run ./setup.sh
-
-4. Compile MySQL as usual.
-
-5. Enjoy!
-
-See the online documentation for more detailed instructions:
-http://www.innodb.com/doc/innodb_plugin-1.0/innodb-plugin-installation.html
-
-For more information about InnoDB visit
-http://www.innodb.com
-
-Please report any problems or issues with the plugin in the InnoDB Forums
-http://forums.innodb.com/ or in the MySQL Bugs database http://bugs.mysql.com
-
-Thank you for using the InnoDB plugin!