diff options
Diffstat (limited to 'storage/xtradb/win-plugin/win-plugin.diff')
| -rw-r--r-- | storage/xtradb/win-plugin/win-plugin.diff | 88 |
1 files changed, 35 insertions, 53 deletions
diff --git a/storage/xtradb/win-plugin/win-plugin.diff b/storage/xtradb/win-plugin/win-plugin.diff index 46d2e5b2d2d..4b3354ac4de 100644 --- a/storage/xtradb/win-plugin/win-plugin.diff +++ b/storage/xtradb/win-plugin/win-plugin.diff @@ -1,7 +1,7 @@ diff -Nur CMakeLists.txt.orig CMakeLists.txt --- CMakeLists.txt.orig 2008-10-03 12:25:41 -05:00 +++ CMakeLists.txt 2008-09-26 17:32:51 -05:00 -@@ -244,9 +244,9 @@ +@@ -254,9 +254,9 @@ IF(WITH_FEDERATED_STORAGE_ENGINE) ADD_SUBDIRECTORY(storage/federated) ENDIF(WITH_FEDERATED_STORAGE_ENGINE) @@ -17,7 +17,7 @@ diff -Nur CMakeLists.txt.orig CMakeLists.txt diff -Nur sql/CMakeLists.txt.orig sql/CMakeLists.txt --- sql/CMakeLists.txt.orig 2008-10-03 12:25:41 -05:00 +++ sql/CMakeLists.txt 2008-09-24 03:58:19 -05:00 -@@ -100,6 +100,15 @@ +@@ -98,6 +98,15 @@ LINK_FLAGS "/PDB:${CMAKE_CFG_INTDIR}/mysqld${MYSQLD_EXE_SUFFIX}.pdb") ENDIF(cmake_version EQUAL 20406) @@ -33,11 +33,11 @@ diff -Nur sql/CMakeLists.txt.orig sql/CMakeLists.txt IF(EMBED_MANIFESTS) MYSQL_EMBED_MANIFEST("mysqld" "asInvoker") ENDIF(EMBED_MANIFESTS) - + diff -Nur sql/mysqld.def.orig sql/mysqld.def --- sql/mysqld.def.orig 1969-12-31 18:00:00 -06:00 -+++ sql/mysqld.def 2008-10-31 02:20:32 -05:00 -@@ -0,0 +1,98 @@ ++++ sql/mysqld.def 2009-04-09 02:20:32 -05:00 +@@ -0,0 +1,111 @@ +EXPORTS + ?use_hidden_primary_key@handler@@UAEXXZ + ?get_dynamic_partition_info@handler@@UAEXPAUPARTITION_INFO@@I@Z @@ -136,11 +136,24 @@ diff -Nur sql/mysqld.def.orig sql/mysqld.def + pthread_cond_destroy + localtime_r + my_strdup ++ deflate ++ deflateEnd ++ deflateReset ++ deflateInit2_ ++ inflateEnd ++ inflateInit_ ++ inflate ++ compressBound ++ inflateInit2_ ++ adler32 ++ longlong2str ++ strend ++ my_snprintf diff -Nur sql/mysqld_x64.def.orig sql/mysqld_x64.def --- sql/mysqld_x64.def.orig 1969-12-31 18:00:00 -06:00 -+++ sql/mysqld_x64.def 2008-10-31 02:22:04 -05:00 -@@ -0,0 +1,98 @@ ++++ sql/mysqld_x64.def 2009-04-09 02:22:04 -05:00 +@@ -0,0 +1,111 @@ +EXPORTS + ?use_hidden_primary_key@handler@@UEAAXXZ + ?get_dynamic_partition_info@handler@@UEAAXPEAUPARTITION_INFO@@I@Z @@ -239,59 +252,28 @@ diff -Nur sql/mysqld_x64.def.orig sql/mysqld_x64.def + pthread_cond_destroy + localtime_r + my_strdup ++ deflate ++ deflateEnd ++ deflateReset ++ deflateInit2_ ++ inflateEnd ++ inflateInit_ ++ inflate ++ compressBound ++ inflateInit2_ ++ adler32 ++ longlong2str ++ strend ++ my_snprintf diff -Nur win/configure.js.orig win/configure.js --- win/configure.js.orig 2008-09-26 21:18:37 -05:00 +++ win/configure.js 2008-10-01 11:21:27 -05:00 -@@ -49,6 +49,7 @@ - case "CYBOZU": +@@ -50,6 +50,7 @@ case "EMBED_MANIFESTS": + case "EXTRA_DEBUG": case "WITH_EMBEDDED_SERVER": + case "INNODB_DYNAMIC_PLUGIN": configfile.WriteLine("SET (" + args.Item(i) + " TRUE)"); break; case "MYSQL_SERVER_SUFFIX": - -diff -Nur win/build-vs71.bat.orig win/build-vs71.bat ---- win/build-vs71.bat.orig 2008-08-20 10:21:59 -05:00 -+++ win/build-vs71.bat 2008-10-27 10:52:38 -05:00 -@@ -15,8 +15,10 @@ - REM along with this program; if not, write to the Free Software - REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -+REM CMAKE_BUILD_TYPE can be specified as Release or Debug -+ - if exist cmakecache.txt del cmakecache.txt - copy win\vs71cache.txt cmakecache.txt --cmake -G "Visual Studio 7 .NET 2003" -+cmake -G "Visual Studio 7 .NET 2003" -DCMAKE_BUILD_TYPE=%1 - copy cmakecache.txt win\vs71cache.txt - -diff -Nur win/build-vs8.bat.orig win/build-vs8.bat ---- win/build-vs8.bat.orig 2008-08-20 10:21:59 -05:00 -+++ win/build-vs8.bat 2008-10-27 10:52:31 -05:00 -@@ -15,7 +15,9 @@ - REM along with this program; if not, write to the Free Software - REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -+REM CMAKE_BUILD_TYPE can be specified as Release or Debug -+ - if exist cmakecache.txt del cmakecache.txt - copy win\vs8cache.txt cmakecache.txt --cmake -G "Visual Studio 8 2005" -+cmake -G "Visual Studio 8 2005" -DCMAKE_BUILD_TYPE=%1 - copy cmakecache.txt win\vs8cache.txt -diff -Nur win/build-vs8_x64.bat.orig win/build-vs8_x64.bat ---- win/build-vs8_x64.bat.orig 2008-08-20 10:21:59 -05:00 -+++ win/build-vs8_x64.bat 2008-10-27 10:53:11 -05:00 -@@ -15,7 +15,9 @@ - REM along with this program; if not, write to the Free Software - REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -+REM CMAKE_BUILD_TYPE can be specified as Release or Debug -+ - if exist cmakecache.txt del cmakecache.txt - copy win\vs8cache.txt cmakecache.txt --cmake -G "Visual Studio 8 2005 Win64" -+cmake -G "Visual Studio 8 2005 Win64" -DCMAKE_BUILD_TYPE=%1 - copy cmakecache.txt win\vs8cache.txt |