mariadb

Tree: 84966af9fc

Author	SHA1	Message	Date
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	cfe8831148	Merge magare.gmz:/home/kgeorge/mysql/work/B27811-5.0-opt into magare.gmz:/home/kgeorge/mysql/autopush/B27811-5.0-opt	19 years ago
unknown	c705567e9c	Fix for bug #22364 "Inconsistent "matched rows" when executing UPDATE" In multi_update::send_data(), the counter of matched rows was not correctly incremented, when during insertion of a new row to a temporay table it had to be converted from HEAP to MyISAM. This fix changes the logic to increment the counter of matched rows in the following cases: 1. If the error returned from write_row() is zero. 2. If the error returned from write_row() is non-zero, is neither HA_ERR_FOUND_DUPP_KEY nor HA_ERR_FOUND_DUPP_UNIQUE, and a call to create_myisam_from_heap() succeeds. mysql-test/r/update.result: Added a test case for bug #22364 "Inconsistent "matched rows" when executing UPDATE" mysql-test/t/update.test: Added a test case for bug #22364 "Inconsistent "matched rows" when executing UPDATE" sql/sql_update.cc: In multi_update::send_data(), the counter of matched rows was not correctly incremented, when during insertion of a new row to a temporay table it had to be converted from HEAP to MyISAM. This fix changes the logic to increment the counter of matched rows in the following cases: 1. If the error returned from write_row() is zero. 2. If the error returned from write_row() is non-zero, is neither HA_ERR_FOUND_DUPP_KEY nor HA_ERR_FOUND_DUPP_UNIQUE, and a call to create_myisam_from_heap() succeeds.	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	b570cee115	Bug #27811 : FORCE_INIT_OF_VARS was not defined for the debug builds on Windows. This caused LINT_INIT macro to be defined as NOP and this triggers false alarms about use of uninitialized with the runtime libs of some Visual Studio versions. Fixed by defining FORCE_INIT_OF_VARS to match the state of the Windows CMakeLists.txt: Bug #27811: added the missing build option mysql-test/r/windows.result: Bug #27811: test case mysql-test/t/windows.test: Bug #27811: test case	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
unknown	f1e81f6c8d	It's not possible to use the return value of fputs to check if the creation of mysql_upgrade_info suceeded. Instead use 'upgrade_already_done' to check that file was created properly.	19 years ago
unknown	77d0d996be	Update test to work also when --pager does not exist in "mysql"	19 years ago
unknown	417eba8384	Changed void* to const NdbDictionary::Table*	19 years ago
unknown	b3e3c3881e	Merge bk-internal:/home/bk/mysql-5.0-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint Makefile.am: Auto merged client/mysql_upgrade.c: Auto merged sql/mysql_priv.h: Auto merged tests/mysql_client_test.c: Auto merged	19 years ago
unknown	6a05f2af3c	Fix warnings reported by icc	19 years ago
unknown	166af98f44	Remove left over file abi_check BitKeeper/deleted/.del-abi_check: Delete: include/abi_check	19 years ago
unknown	18ea538648	Remove left over file fix_priv_tabs.result BitKeeper/deleted/.del-fix_priv_tabs.result: Delete: mysql-test/r/fix_priv_tabs.result	19 years ago
unknown	7d954c94fd	Merge debian.(none):/M41/mysql-4.1 into debian.(none):/M41/push-4.1	19 years ago
unknown	b0dc094804	Merge debian.(none):/M50/mysql-5.0 into debian.(none):/M50/push-5.0	19 years ago
unknown	c067b03c86	Changed descriptive comment	19 years ago
unknown	c40726c3ce	Moved all code related to engine_condition_pushdown to a new class, ha_ndbcluster_cond. Added new files: sql/ha_ndbcluster_cond.h sql/ha_ndbcluster_cond.cc sql/ha_ndbcluster_cond.cc: BitKeeper file /windows/Linux_space/MySQL/mysql-5.0-ndb/sql/ha_ndbcluster_cond.cc sql/ha_ndbcluster_cond.h: BitKeeper file /windows/Linux_space/MySQL/mysql-5.0-ndb/sql/ha_ndbcluster_cond.h sql/Makefile.am: Added compilation of new separate files for engine_condition_pushdown sql/ha_ndbcluster.cc: Moved all code related to engine_condition_pushdown to ha_ndbcluster_cond sql/ha_ndbcluster.h: Moved all code related to engine_condition_pushdown to ha_ndbcluster_cond	19 years ago
unknown	aeeb2df0bd	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	984d8e23d6	Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint mysql-test/lib/mtr_process.pl: Auto merged	19 years ago
unknown	d19d4b3f4f	Protect against killing pid's that would "killall" or "kill self"	19 years ago
unknown	aa8c240f93	Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-27701 into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work	19 years ago
unknown	c94da3764f	Merge bk-internal:/home/bk/mysql-5.0 into blade09.mysql.com:/tmp/mmj/mysql-5.0-runtime	19 years ago
unknown	b2bd69adbf	Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/home/psergey/mysql-5.0-bug27939 sql/sql_select.cc: Auto merged	19 years ago
unknown	8a702a1e7b	Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 into bk-internal.mysql.com:/data0/bk/mysql-5.0-opt sql/item_cmpfunc.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_view.cc: Auto merged	19 years ago
unknown	594f7bd2fe	Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base into weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge mysql-test/r/sp.result: Auto merged mysql-test/t/sp.test: Auto merged	19 years ago
unknown	b873193ab6	Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint into qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-debian	19 years ago
unknown	5fb275a6f5	Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/home/psergey/mysql-5.0-bug27939	19 years ago
unknown	4868ef1d80	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint	19 years ago
unknown	1c04850b95	Avoid compiler warnings.	19 years ago
unknown	0d3c448353	Makefile.am: Typo mysql-test/Makefile.am: Typo	19 years ago
unknown	79476ab29d	Makefile.am: Added the 'suite' directory to the source TAR and install mysql-test/Makefile.am: Added the 'suite' directory to the source TAR and install	19 years ago
unknown	d5ca6582b4	Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/home/psergey/mysql-5.0-bug27939 sql/sql_select.cc: Auto merged	19 years ago
unknown	4a3027aaa2	Added missing result file for rpl_critical_errors. mysql-test/r/rpl_critical_errors.result: New BitKeeper file ``mysql-test/r/rpl_critical_errors.result''	19 years ago
unknown	323a213539	Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt into gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt-27704	19 years ago
unknown	c441a3dc34	Construction does not work on hpux aCC, so some refactoring	19 years ago
unknown	11fe01f58f	Merge debian.(none):/M41/push-4.1 into debian.(none):/M50/push-5.0	19 years ago
unknown	a501fdd695	Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-4.1-opt-27704 into gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt-27704 mysql-test/r/subselect.result: Auto merged mysql-test/t/row.test: Auto merged mysql-test/r/row.result: Test case updated for Bug#27704 (incorrect comparison of rows with NULL components). sql/item_cmpfunc.cc: Bug#27704: incorrect comparison of rows with NULL components. sql/item_cmpfunc.h: Bug#27704: incorrect comparison of rows with NULL components. Cosmetic fix.	19 years ago
unknown	515c64875b	Merge debian.(none):/M50/mysql-5.0 into debian.(none):/M50/push-5.0 sql/ha_ndbcluster.cc: Auto merged sql/sql_delete.cc: Auto merged	19 years ago
unknown	ad14c2475b	Merge debian.(none):/M50/bug27739-5.0 into debian.(none):/M50/push-5.0 configure.in: Auto merged	19 years ago
unknown	a8f639fccc	Bug#27704: incorrect comparison of rows with NULL components Support for NULL components was incomplete for row comparison, fixed. Added support for abort_on_null at compare_row() like in 5.x sql/item_cmpfunc.h: Bug#27704: incorrect comparison of rows with NULL components Added support for abort_on_null at Item_bool_func2 like in 5.x sql/item_cmpfunc.cc: Bug#27704: incorrect comparison of rows with NULL components Support for NULL components was incomplete for row comparison, fixed. Added support for abort_on_null at compare_row() like in 5.x mysql-test/t/row.test: Test case updated for Bug#27704 (incorrect comparison of rows with NULL components) mysql-test/r/row.result: Test case updated for Bug#27704 (incorrect comparison of rows with NULL components) mysql-test/r/subselect.result: Test case updated for Bug#27704 (incorrect comparison of rows with NULL components)	19 years ago

... 2 3 4 5 6 ...

36296 Commits (84966af9fc33a4cfa72f24a57da170db28f1c55a) All Branches Search

36296 Commits (84966af9fc33a4cfa72f24a57da170db28f1c55a)

All Branches