mariadb

Tree: 4ac4ee4bf1

Author	SHA1	Message	Date
unknown	4ac4ee4bf1	Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-cmake-map-files into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build CMakeLists.txt: Auto merged	19 years ago
unknown	11a630c4ca	generate map files on windows CMakeLists.txt: Generate map files for executables	19 years ago
unknown	56c184503c	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb sql/ha_ndbcluster.cc: Auto merged	19 years ago
unknown	f63100e144	Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines	19 years ago
unknown	38cbcf7c36	Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-build into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines	19 years ago
unknown	a4bfd85414	Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-build into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines	19 years ago
unknown	11a36eb5ec	Merge trift-lap.fambruehe:/MySQL/M50/clone-5.0 into trift-lap.fambruehe:/MySQL/M50/push-5.0 Makefile.am: Auto merged scripts/mysql_install_db.sh: Auto merged scripts/mysql_system_tables.sql: Auto merged scripts/mysql_system_tables_data.sql: Auto merged sql/item_subselect.h: Auto merged ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Manual merge: Use the symbolic constant. ndb/test/ndbapi/testScanFilter.cpp: Manual merge: Use the standard text.	19 years ago
unknown	7115585f27	Merge trift-lap.fambruehe:/MySQL/M41/push-4.1 into trift-lap.fambruehe:/MySQL/M50/push-5.0	19 years ago
unknown	b6eb3e40fd	Merge trift-lap.fambruehe:/MySQL/M41/mysql-4.1 into trift-lap.fambruehe:/MySQL/M41/push-4.1	19 years ago
unknown	8a6629e1f4	Merge trift-lap.fambruehe:/MySQL/M50/mysql-5.0 into trift-lap.fambruehe:/MySQL/M50/push-5.0 configure.in: Auto merged include/Makefile.am: Auto merged	19 years ago
unknown	11a463bbff	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb	19 years ago
unknown	4a517d4c96	Merge ymer.(none):/usr/local/mysql/mysql-5.0-ndb-bug27370 into ymer.(none):/usr/local/mysql/mysql-5.0-ndb ndb/include/ndbapi/NdbScanOperation.hpp: Auto merged ndb/src/ndbapi/NdbBlob.cpp: Auto merged ndb/src/ndbapi/NdbScanOperation.cpp: Auto merged ndb/test/run-test/daily-basic-tests.txt: Auto merged ndb/test/ndbapi/testBlobs.cpp: Manual merge.	19 years ago
unknown	246232268c	Fix test case that was broken for builds without InnoDB. mysql-test/t/sp.test: Disable warnings during table creation in one place where engine=innodb is used, in order to make this test case work with a mysqld that was compiled without InnoDB.	19 years ago
unknown	4573d03411	Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41 into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50	19 years ago
unknown	806e35280e	Merge ymer.(none):/usr/local/mysql/mysql-5.0-telco-gca into ymer.(none):/usr/local/mysql/mysql-5.0-ndb ndb/include/ndbapi/NdbTransaction.hpp: Auto merged ndb/src/ndbapi/NdbTransaction.cpp: Auto merged ndb/test/run-test/daily-basic-tests.txt: Auto merged	19 years ago
unknown	9a9ff15012	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb sql/ha_ndbcluster.cc: SCCS merged	19 years ago
unknown	10b5227bb0	Bug #28093 ndb: retry sleep in get table stats 30s instead of 30ms	19 years ago
unknown	2399e1c994	BUG#27495: Missing implementation of NdbTransaction::executeAsynch(). NdbTransaction::executeAsynch() was not implemented. Add implementation. ndb/include/ndbapi/NdbTransaction.hpp: executeAsynch() should probably allow setting forceSend. ndb/src/ndbapi/NdbTransaction.cpp: Add missing implementation of executeAsynch(). ndb/test/ndbapi/testNdbApi.cpp: Add test case. ndb/test/run-test/daily-basic-tests.txt: Add new test.	19 years ago
unknown	9e50967584	Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build	19 years ago
unknown	879e0a1245	restrict recently added file to GPLv2 ndb/test/ndbapi/testScanFilter.cpp: restrict to GPLv2	19 years ago
unknown	ea71308435	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb sql/ha_ndbcluster.cc: Auto merged	19 years ago
unknown	f692f710b7	Merge pilot.blaudden:/home/msvensson/mysql/bug25118/my50-bug25118 into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint include/my_global.h: Auto merged include/my_sys.h: Auto merged	19 years ago
unknown	90bb6c54f2	Merge bk-internal:/home/bk/mysql-5.0-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint	19 years ago
unknown	986ff659fa	Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work	19 years ago
unknown	40f8ab04a5	Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build	19 years ago
unknown	6d38c87d70	Merge mysql.com:/home/ram/work/mysql-4.1-maint into mysql.com:/home/ram/work/b27515/b27515.4.1	19 years ago
unknown	b9b1da75dd	Merge mysql.com:/home/ram/work/mysql-4.1-maint into mysql.com:/home/ram/work/b27515/b27515.4.1	19 years ago
unknown	75a424ee0a	Merge bk-internal:/home/bk/mysql-5.0-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint	19 years ago
unknown	38672eb798	Moved method definition to ease merge to 5.1	19 years ago
unknown	de71b10745	Merge pilot.blaudden:/home/msvensson/mysql/bug14862/my50-bug14862 into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint include/my_global.h: Auto merged	19 years ago
unknown	842cbb01fd	Merge mysql.com:/home/ram/work/mysql-5.0-maint into mysql.com:/home/ram/work/b27515/b27515.5.0 mysql-test/r/grant.result: Auto merged mysql-test/t/grant.test: Auto merged sql/sql_parse.cc: Auto merged	19 years ago
unknown	25b372b3fd	Back-ported compiler warning fixes from 5.1 to ease merging	19 years ago
unknown	3aea34b452	after-merge fix	19 years ago
unknown	5fae29039d	BUG#27370: Potential inconsistent blob reads for ReadCommitted reads. The old blob implementation had code that attempted to upgrade the lock mode for LM_CommittedRead operations, but it did not work properly as it did not recompute the operation flags. As a consequence, reading a blob with LM_CommittedRead could return inconsistent data, with different part of the read data being from different commits done by other transactions. The fix is to correctly recompute all necessary flags when upgrading lock mode. ndb/include/kernel/signaldata/ScanTab.hpp: Remove assumption in setXXX() methods that old value is zero, needed to allow blob code to upgrade lock mode. Fix spelling and commments. ndb/include/ndbapi/NdbOperation.hpp: Add method to change lock mode, to allow blob code to upgrade lock mode. ndb/include/ndbapi/NdbScanOperation.hpp: Add method to change lock mode, to allow blob code to upgrade lock mode. ndb/src/ndbapi/NdbBlob.cpp: Fix upgrading lock mode (old code had no effect). ndb/src/ndbapi/NdbOperationDefine.cpp: Add method to change lock mode, to allow blob code to upgrade lock mode. ndb/src/ndbapi/NdbScanOperation.cpp: Add method to change lock mode, to allow blob code to upgrade lock mode. ndb/test/ndbapi/testBlobs.cpp: Add testcase. ndb/test/run-test/daily-basic-tests.txt: Enable bug tests for auto test.	19 years ago
unknown	b8850e15db	Merge mysql.com:/home/ram/work/b27515/b27515.4.1 into mysql.com:/home/ram/work/b27515/b27515.5.0 mysql-test/r/grant.result: will be merged in a post-merge CS mysql-test/t/grant.test: manual merge sql/sql_parse.cc: manual merge	19 years ago
unknown	6b2685b664	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint into recycle.(none):/src/bug24732/my50-bug24732	19 years ago
unknown	6f6f68066b	Bug#24732 Executables do not include Vista manifests - Correct PushBuild failure. win/Makefile.am: Bug#24732 Executables do not include Vista manifests - Make sure new files are included in make dist builds.	19 years ago
unknown	7f43970820	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint into recycle.(none):/src/bug24732/my50-bug24732	19 years ago
unknown	1ce0d7c63b	Bug#24732 Executables do not include Vista manifests - Added script to generate application specific manifest. - Added new CMake MACRO to add customer build events which will first generate a manifest and then embeds that manifest into an executable. BitKeeper/etc/ignore: Bug#24732 Executables do not include Vista manifests - Revise ignore rules to disallow auto-generated cmake files but to allow custom macros defined in a .cmake file. CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Added logic for EMBED_MANIFESTS configuration option. client/CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Embed manifest with custom CMake MACRO for client executables. extra/CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Embed manifest with custom CMake MACRO for my_print_default executable. libmysql/CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Embed manifest with custom CMake MACRO for myTest executable. myisam/CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Embed manifest with custom CMake MACRO for myisam executables. server-tools/instance-manager/CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Embed manifest with custom CMake MACRO for mysqlmanager executable. sql/CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Embed manifest with custom CMake MACRO for mysqld executable. win/README: Bug#24732 Executables do not include Vista manifests - Added new configuration option documentation. win/configure.js: Bug#24732 Executables do not include Vista manifests - Added new EMBED_MANIFESTS configuration option. win/create_manifest.js: Bug#24732 Executables do not include Vista manifests - Manifest generator. This script generates a basic manifest. win/mysql_manifest.cmake: Bug#24732 Executables do not include Vista manifests - Define new CMake MACRO for adding Windows manifests to executables.	19 years ago
unknown	31b48d64cf	Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41 into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41	19 years ago
unknown	68d4ee627e	mysql_upgrade.test: Fix minor merge "oopsie" mysql-test/t/mysql_upgrade.test: Fix minor merge "oopsie"	19 years ago
unknown	dc5dd7a264	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint into recycle.(none):/src/bug25621/my50-bug25621 sql/mysqld.cc: Auto merged	19 years ago
unknown	800d74f208	Bug#25621 Error in my_thread_global_end(): 1 threads didn't exit - On Windows, connection handlers while exiting properly did not decrement the server's thread count. sql/mysqld.cc: Bug#25621 Error in my_thread_global_end(): 1 threads didn't exit - Make sure that connection handlers decrement number of threads and handlers on Windows. - Signal condition variable before unlocking mutex.	19 years ago
unknown	cc80e5aca0	Merge debian.(none):/M41/push-4.1 into debian.(none):/M50/push-5.0	19 years ago
unknown	08cb8481a7	Merge debian.(none):/M50/bug14685-5.0 into debian.(none):/M50/push-5.0	19 years ago
unknown	83689eb08d	Don't copy any subdirs in scripts/	19 years ago
unknown	20b22b40cf	Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint client/mysql.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged	19 years ago
unknown	b44eee2a67	Add "name of struct" as first arg to comp_sql Fix "make distcheck" scripts/CMakeLists.txt: Add "name of struct" as first arg to comp_sql scripts/comp_sql.c: Add "name of struct" as first arg to comp_sql	19 years ago
unknown	e67c28ca49	dbug/dbug_analyze.c : Avoid the unresolved symbol "my_thread_global_init()" in a build "--without-server". Fix for bug#14685 dbug/dbug_analyze.c: In a build "--without-server", the libraries will be built without threading. In this case, "my_thread_global_init()" is missing in the libraries, and the linker will report an unresolved symbol. Avoid this error by making the call to "my_thread_global_init()" depend on "#ifdef THREAD". Fix for bug#14685	19 years ago
unknown	09e6e6618f	Use a temp variable "error" for storing return code of pclose so the WEXITSTATUS macro can "fiddle" with it as it so pleases	19 years ago

1 2 3 4 5 ...

36174 Commits (4ac4ee4bf13325dc374541da9eeda362be5628d0) All Branches Search

36174 Commits (4ac4ee4bf13325dc374541da9eeda362be5628d0)

All Branches