mariadb

Tree: dc803c99d0

Author	SHA1	Message	Date
Vladislav Vaintroub	e378fa5be0	Bug #49811 : inconsistent usage of SAFEMALLOC in debug compilation on windows Remove per-project SAFEMALLOCs definitions, as they result in malloc/free mismatches.	16 years ago
Vladislav Vaintroub	b1c355b34c	Bug #48317 cannot build innodb as static library. The problem here is that the latest innodb push contains both MYSQL_STORAGE_ENGINE(INNOBASE) and MYSQL_STORAGE_ENGINE(INNOBASE) in the same CMakeLists.txt, to make the resulting library ha_innodb.dll, instead of ha_innobase.dll. Using multiple MYSQL_STORAGE_ENGINE within the same CMakeLists.txt conflicts with the fix for the bug Bug #47795 "CMake, storage engine name different from directory name". Top-level CMakeLists.txt now parses storage engine's CMakeLists.txt to extract engines name from MYSQL_STORAGE_ENGINE(). For innodb, it concludes that there is not storage engine named INNOBASE, hence WITH_INNOBASE_STORAGE_ENGINE has no effect. The fix is to use SET_TARGET_PROPERTIES(... PROPERTIES OUTPUT_NAME ...), instead of renaming the engine to have plugins named ha_innodb.dll.	16 years ago
Satya B	0ddb2ca740	Fix the windows Build failure due to the changes to CMakelists by r2910. Remove the extra line which try to use the name INNOBASE again. The IF ELSE loop above declares the library name based on the version of mysql	16 years ago
Satya B	bca54639b6	Merge a CMakeLists.txt change from Innodb plugin 1.0.5	16 years ago
Satya B	a0e12ec269	Merging Innodb plugin 1.0.5 revisions from 5.1-main from revisions 3149 to 3163 also merged missing Innodb plugin revisions r5636,r5635 manually	16 years ago
Vladislav Vaintroub	2801599323	Backport http://lists.mysql.com/commits/57778 2677 Vladislav Vaintroub 2008-11-04 CMakeLists.txt files cleanup - remove SAFEMALLOC and SAFE_MUTEX definitions that were present in each CMakeLists.txt. Instead, put them into top level CMakeLists.txt, but disable on Windows, because a) SAFEMALLOC does not add any functionality that is not already present in Debug C runtime ( and 2 safe malloc one on top of the other only unnecessarily slows down the server) b)SAFE_MUTEX does not work on Windows and have been explicitely disabled on Windows with #undef previously. Fortunately, ntdll does pretty good job identifying l problems with CRITICAL_SECTIONs. DebugBreak()s on using uninited critical section, unlocking unowned critical section) -Also, remove occationally used -D_DEBUG (added by compiler anyway)	16 years ago
Guilhem Bichot	ef1039ab3c	small cmake fix for Windows build	17 years ago
Guilhem Bichot	56fb9592e9	Fixes to tests and their results, to account for differences between InnoDB 1.0.4 and the old builtin. All committed result differences have either been verified by me or copied from Oracle's provided results (storage/innodb_plugin/mysql-test/*.result, storage/innodb_plugin/mysql-test/patches).	17 years ago
Guilhem Bichot	29a46b4cf9	Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same layout as we always had in trees containing only the builtin 2) win\configure.js WITH_INNOBASE_STORAGE_ENGINE still works.	17 years ago
Sergey Vojtovich	0feaa38241	Update to innoplug-1.0.4.	17 years ago
Vladislav Vaintroub	31b79618e3	Backport WL#3653 to 5.1 to enable bundled innodb plugin. Remove custom DLL loader code from innodb plugin code, use symbols exported from mysqld.	17 years ago
Satya B	1b9fe0bbac	Adding innodb_plugin-1.0.4 as storage/innodb_plugin.	17 years ago

26 Commits (dc803c99d0dcf4b6f2e8ed8fed18fda643c383ac)