mariadb

Tree: 1f07de22e0

Author	SHA1	Message	Date
unknown	1f07de22e0	Merge mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.0-ndb into mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.1-ndb BUILD/Makefile.am: Auto merged config/ac-macros/ha_ndbcluster.m4: Auto merged storage/ndb/src/common/transporter/SCI_Transporter.cpp: Auto merged storage/ndb/src/common/transporter/SCI_Transporter.hpp: Auto merged libmysqld/Makefile.am: Manual merge libmysqld/examples/Makefile.am: Manual merge	19 years ago
unknown	b953566011	New SCI Transporter Build scripts	19 years ago
unknown	ef4445187c	Fix SCI Transporter config/ac-macros/ha_ndbcluster.m4: Fix SCI Transporter build part libmysqld/Makefile.am: Fix SCI Transporter build part libmysqld/examples/Makefile.am: Fix SCI Transporter build part	19 years ago
unknown	a33d5e1755	ndb - bug#28276 Fix DeleteRead in multi-operation Dont use setup_read, as it will (correctly) find that tuple is deleted storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Fix multi-op DeleteRead storage/ndb/test/ndbapi/testBasic.cpp: Fix multi-op DeleteRead	19 years ago
unknown	632e03f86d	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	764e010e8c	bugfix in checksum with force varpart mysql-test/mysql-test-run.pl: bigger needed for running some tests	19 years ago
unknown	5c6dec8d84	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user	19 years ago
unknown	70d440ace3	Merge trift2.:/MySQL/M50/netware-cross-5.0 into trift2.:/MySQL/M51/netware-cross-5.1 scripts/Makefile.am: Manual merge.	19 years ago
unknown	ad33a48afc	Better distinction between "CLEANFILES" and "DISTCLEANFILES" for some generated files (here: "scripts/mysql_fix_privilege_tables{.sql,_sql.c}"). Important for cross-builds. scripts/Makefile.am: Generated files like "mysql_fix_privilege_tables{.sql,_sql.c}" should survive a "make clean", this is essential for cross-builds. So move them from "CLEANFILES" to "DISTCLEANFILES".	19 years ago
unknown	f32d1e9b49	Updated funcs_1 files to 5.1.18 level - validating current result files - updating with new features in information_schema / error messages - forced order by and removed time stamps removed a_version files that are not needed (now that the suite is in the main tree Note: datadict tests still fail as a result of bug 28181 (a regression introduced in 5.0.42 - and 5.1.18(?) - tests should runn clean once it is fixed BitKeeper/deleted/.del-a_version_check.test~82ea7fb267df9e58: Delete: mysql-test/suite/funcs_1/t/a_version_check.test BitKeeper/deleted/.del-a_version_check.result~97a8ec1e3211c26: Delete: mysql-test/suite/funcs_1/r/a_version_check.result mysql-test/suite/funcs_1/datadict/datadict_load.inc: Modified to correct failiure to return host name on some systems mysql-test/suite/funcs_1/datadict/datadict_master.inc: corrections to fooce order by on queries, replace time stamps with strings and enable the testing of referential_constraints table mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc: corrections to force order by on queries mysql-test/suite/funcs_1/r/innodb__datadict.result: Updated result file with order by selects, elimination of time stamps and selects of empty user (that we don't have anymore) and adding the testing of referential_constraints table mysql-test/suite/funcs_1/r/innodb_func_view.result: confirming existing results as correct - old result file had wrong cast values mysql-test/suite/funcs_1/r/innodb_trig_0102.result: Corrected error with long trigger name (that was previously quietly trimmed) mysql-test/suite/funcs_1/r/innodb_trig_08.result: confirmed existing results as corrects ones - updated error message mysql-test/suite/funcs_1/r/innodb_views.result: confirmed current results as correct - returned results included a wrong 'expected' error message mysql-test/suite/funcs_1/r/memory__datadict.result: Updated result file with order by selects, elimination of time stamps and selects of empty user (that we don't have anymore) and adding the testing of referential_constraints table mysql-test/suite/funcs_1/r/memory_func_view.result: confirming existing results as correct - old result file had wrong cast values mysql-test/suite/funcs_1/r/memory_trig_0102.result: Corrected error with long trigger name (that was previously quietly trimmed) mysql-test/suite/funcs_1/r/memory_trig_08.result: confirmed existing results as corrects ones - updated error message mysql-test/suite/funcs_1/r/memory_views.result: confirmed current results as correct - returned results included a wrong 'expected' error message mysql-test/suite/funcs_1/r/myisam__datadict.result: Updated result file with order by selects, elimination of time stamps and selects of empty user (that we don't have anymore) and adding the testing of referential_constraints table mysql-test/suite/funcs_1/r/myisam_func_view.result: confirming existing results as correct - old result file had wrong cast values mysql-test/suite/funcs_1/r/myisam_trig_0102.result: Corrected error with long trigger name (that was previously quietly trimmed) mysql-test/suite/funcs_1/r/myisam_trig_08.result: confirmed existing results as corrects ones - updated error message mysql-test/suite/funcs_1/r/myisam_views.result: confirmed current results as correct - returned results included a wrong 'expected' error message mysql-test/suite/funcs_1/r/ndb__datadict.result: Updated result file with order by selects, elimination of time stamps and selects of empty user (that we don't have anymore) and adding the testing of referential_constraints table mysql-test/suite/funcs_1/r/ndb_func_view.result: confirming existing results as correct - old result file had wrong cast values mysql-test/suite/funcs_1/r/ndb_trig_0102.result: Corrected error with long trigger name (that was previously quietly trimmed) mysql-test/suite/funcs_1/r/ndb_trig_08.result: confirmed existing results as corrects ones - updated error message mysql-test/suite/funcs_1/r/ndb_views.result: confirmed current results as correct - returned results included a wrong 'expected' error message mysql-test/suite/funcs_1/t/disabled.def: Updated disabled messages with clearer ones mysql-test/suite/funcs_1/triggers/triggers_0102.inc: Added code to test for error in case of a trigger name that is to long mysql-test/suite/funcs_1/views/views_master.inc: Correction to remove wrong '--eror' meaningless tag that generated warnings	19 years ago
unknown	9460b8c4d3	Merge linux.site:/home/omer/source/bld50_tmp into linux.site:/home/omer/source/bld51_2 BitKeeper/deleted/.del-a_version_check.result: Auto merged BitKeeper/deleted/.del-a_version_check.test: Auto merged BitKeeper/deleted/.del-datadict_load.inc: Auto merged BitKeeper/deleted/.del-datadict_master.inc: Auto merged BitKeeper/deleted/.del-datadict_show_schema.inc: Auto merged BitKeeper/deleted/.del-disabled.def~1: Auto merged BitKeeper/deleted/.del-innodb__datadict.result: Auto merged BitKeeper/deleted/.del-innodb_trig_08.result: Auto merged BitKeeper/deleted/.del-innodb_views.result: Auto merged BitKeeper/deleted/.del-memory__datadict.result: Auto merged BitKeeper/deleted/.del-memory_trig_08.result: Auto merged BitKeeper/deleted/.del-memory_views.result: Auto merged BitKeeper/deleted/.del-myisam__datadict.result: Auto merged BitKeeper/deleted/.del-myisam_trig_08.result: Auto merged BitKeeper/deleted/.del-views_master.inc: Auto merged BitKeeper/deleted/.del-innodb_func_view.result: manual merge - using local file BitKeeper/deleted/.del-memory_func_view.result: manual merge - using local file BitKeeper/deleted/.del-myisam_func_view.result: manual merge - using local file BitKeeper/deleted/.del-myisam_views.result: manual merge - using local file	19 years ago
unknown	dc39e2c20e	Merge obarnir@bk-internal.mysql.com:/home/bk/mysql-5.0-build into linux.site:/home/omer/source/bld50_2	19 years ago
unknown	2478a8be0c	Resolve a possible timing issue with "scripts/mysql_fix_privilege_tables_sql.c" in the source tarball, this is essential for cross builds, like for NetWare. scripts/Makefile.am: On a fast build machine, both the source (mysql_fix_privilege_tables.sql) and the generated file (mysql_fix_privilege_tables_sql.c) may have identical timestamps (granularity is one second only, may be too coarse). If that happens, the Makefile rule will fire, and "comp_sql" will be built and called - which fails in a cross build, like for NetWare. Prevent that by sleeping for 5 (five) seconds, this will ensure a time difference.	19 years ago
unknown	2f2f11b3de	Merge trift2.:/MySQL/M50/spec-5.0 into trift2.:/MySQL/M50/push-5.0	19 years ago
unknown	e817a16a5c	Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build scripts/Makefile.am: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~1: Auto merged	19 years ago
unknown	eb92ed037c	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 CMakeLists.txt: Auto merged	19 years ago
unknown	c444c3b564	Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build BitKeeper/deleted/.del-CMakeLists.txt~1: Auto merged	19 years ago
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	7383bca404	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.1-build-work BitKeeper/deleted/.del-CMakeLists.txt~1: Auto merged	19 years ago
unknown	cc61eeb429	Merge trift2.:/MySQL/M51/spec-5.1 into trift2.:/MySQL/M51/push-5.1	19 years ago
unknown	11b49c6c40	Merge trift2.:/MySQL/M51/mysql-5.1 into trift2.:/MySQL/M51/push-5.1 scripts/Makefile.am: Auto merged	19 years ago
unknown	898fc2e210	Merge trift2.:/MySQL/M50/mysql-5.0 into trift2.:/MySQL/M50/push-5.0 scripts/Makefile.am: Auto merged	19 years ago
unknown	cd66d3dd12	"ndb_size.tmpl" is gone (NDB change 2007-04-24), so remove it from the spec file.	19 years ago
unknown	c2a2bc6d8d	Merge trift2.:/MySQL/M50/spec-5.0 into trift2.:/MySQL/M51/spec-5.1 support-files/mysql.spec.sh: Auto merged	19 years ago
unknown	95aa256dda	Merge trift2.:/MySQL/M41/spec-4.1 into trift2.:/MySQL/M50/spec-5.0 support-files/mysql.spec.sh: SCCS merged	19 years ago
unknown	09812630ca	RPM spec file error: Trailing '' to cover '.gz' for a man page was missing. support-files/mysql.spec.sh: Man pages may/will be compressed, so the file name needs trailing '' to cover '.gz'.	19 years ago
unknown	3630525429	Coeection to the bug format to for better search - review comment	19 years ago
unknown	11a630c4ca	generate map files on windows CMakeLists.txt: Generate map files for executables	19 years ago
unknown	aeeac397e9	Manual merge: Makefile lines must start with tab, not blank.	19 years ago
unknown	67601f55cb	Merge trift2.:/MySQL/M50/mysql-5.0 into trift2.:/MySQL/M51/mysql-5.1 libmysqld/Makefile.am: Auto merged netware/Makefile.am: Auto merged scripts/Makefile.am: Auto merged BitKeeper/deleted/.del-Makefile.am~2: Auto merged client/Makefile.am: Merge does not fit - to be done manually.	19 years ago
unknown	589ae7b4e0	Format corrections for various "Makefile.am": Leading tab, no trailing blank. client/Makefile.am: "Makefile" command lines must start with a tab, not with blanks. libmysqld/Makefile.am: "Makefile" command lines must start with a tab, not with blanks. netware/Makefile.am: "Makefile" command lines must start with a tab, not with blanks. scripts/Makefile.am: "Makefile" command lines must start with a tab, not with blanks. win/Makefile.am: After a backslash (to mark a continuation line) there must not be a trailing blank.	19 years ago
unknown	d8b693a329	Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb	19 years ago
unknown	0db0e2699d	Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb	19 years ago
unknown	deab2c1a66	ha_ndbcluster.cc: Bug#27980 INSERT IGNORE wrongly ignores NULLs in unique index: added check for null values sql/ha_ndbcluster.cc: Bug#27980 INSERT IGNORE wrongly ignores NULLs in unique index: added check for null values	19 years ago
unknown	b4ee801c51	Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb mysql-test/r/ndb_insert.result: Auto merged mysql-test/t/ndb_insert.test: Auto merged sql/ha_ndbcluster.cc: Using local (will hand merge).	19 years ago
unknown	4b25d4a0d7	ndb_insert.test, ndb_insert.result, ha_ndbcluster.cc: Bug#27980 INSERT IGNORE wrongly ignores NULLs in unique index: added check for null values mysql-test/t/ndb_insert.test: Bug#27980 INSERT IGNORE wrongly ignores NULLs in unique index: added check for null values sql/ha_ndbcluster.cc: Bug#27980 INSERT IGNORE wrongly ignores NULLs in unique index: added check for null values mysql-test/r/ndb_insert.result: Bug#27980 INSERT IGNORE wrongly ignores NULLs in unique index: added check for null values	19 years ago
unknown	55153730b2	Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51 mysql-test/r/alter_table.result: Auto merged mysql-test/t/alter_table.test: Auto merged sql/item_func.h: Auto merged	19 years ago
unknown	c1155eb117	mysql-test-run.pl: Run master init scripts also for --embedded-server mysql-test/mysql-test-run.pl: Run master init scripts also for --embedded-server	19 years ago
unknown	df1ad225dd	Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51 sql/item_func.h: Auto merged	19 years ago
unknown	dc9b20a603	Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 sql/item_func.h: Auto merged	19 years ago
unknown	51d6e623ff	Updates to test/result files of funcs_1 to 5.0.40 level, - validated current result files - forced order by and removed time stamps removed a_version files (since do not make sense now when suite is in the main tree) Note: datadict tests still fail as a result of regression bug 28181 in 5.0.42 (discovered while performing this update) - tests should run clean once bug is fixed BitKeeper/deleted/.del-a_version_check.test: Delete: mysql-test/suite/funcs_1/t/a_version_check.test BitKeeper/deleted/.del-a_version_check.result: Delete: mysql-test/suite/funcs_1/r/a_version_check.result BitKeeper/deleted/.del-innodb_views.warnings: Delete: mysql-test/suite/funcs_1/r/innodb_views.warnings BitKeeper/deleted/.del-memory_views.warnings: Delete: mysql-test/suite/funcs_1/r/memory_views.warnings BitKeeper/deleted/.del-myisam_views.warnings: Delete: mysql-test/suite/funcs_1/r/myisam_views.warnings mysql-test/suite/funcs_1/datadict/datadict_load.inc: Modified to correct failiure to return host name on some systems mysql-test/suite/funcs_1/datadict/datadict_master.inc: corrections to force order by on queries and replace time stamps with strings mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc: corrections to force order by on queries mysql-test/suite/funcs_1/r/innodb__datadict.result: Updated result file with order bu selects, elimination of time stamps and selects with empty user (that we don't have anymore) mysql-test/suite/funcs_1/r/innodb_func_view.result: confirming existing results as correct ones - old result file had wrong cast values returned mysql-test/suite/funcs_1/r/innodb_trig_08.result: confirming existing results as correct ones - updated error message mysql-test/suite/funcs_1/r/innodb_views.result: confirming existing results as correct ones - returned results are correct, wrong 'expected' error messages removed mysql-test/suite/funcs_1/r/memory__datadict.result: Updated result file with order bu selects, elimination of time stamps and selects with empty user (that we don't have anymore) mysql-test/suite/funcs_1/r/memory_func_view.result: confirming existing results as correct ones - old result file had wrong cast values returned mysql-test/suite/funcs_1/r/memory_trig_08.result: confirming existing results as correct ones - updated error message mysql-test/suite/funcs_1/r/memory_views.result: confirming existing results as correct ones - returned results are correct, wrong 'expected' error messages removed mysql-test/suite/funcs_1/r/myisam__datadict.result: Updated result file with order bu selects, elimination of time stamps and selects with empty user (that we don't have anymore) mysql-test/suite/funcs_1/r/myisam_func_view.result: confirming existing results as correct ones - old result file had wrong cast values returned mysql-test/suite/funcs_1/r/myisam_trig_08.result: confirming existing results as correct ones - updated error message mysql-test/suite/funcs_1/r/myisam_views.result: confirming existing results as correct ones - returned results are correct, wrong 'expected' error messages removed mysql-test/suite/funcs_1/t/disabled.def: Updated disabled messages with clearer ones mysql-test/suite/funcs_1/views/views_master.inc: removed invalid -- lines generating warning files	19 years ago
unknown	583583244a	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user	19 years ago
unknown	350afd1ed6	Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51 mysql-test/r/alter_table.result: Auto merged mysql-test/t/alter_table.test: Auto merged	19 years ago
unknown	f827425712	Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 mysql-test/r/alter_table.result: Auto merged mysql-test/t/alter_table.test: Auto merged	19 years ago
unknown	0e20de498a	Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt into mysql.com:/d2/hf/mrg/mysql-5.1-opt mysql-test/r/olap.result: Auto merged mysql-test/r/type_datetime.result: Auto merged mysql-test/t/type_datetime.test: Auto merged sql/item_func.h: Auto merged sql/sql_select.cc: Auto merged	19 years ago
unknown	8e7cf826c6	Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51 mysql-test/lib/mtr_report.pl: Auto merged sql/sql_table.cc: Manual merge	19 years ago
unknown	a41d1a41b3	Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51	19 years ago
unknown	8eb22d157d	Fix braindead bad merge of mysqldump test. mysql-test/r/mysqldump.result: Fix braindead bad merge mysql-test/t/mysqldump.test: Fix braindead bad merge	19 years ago
unknown	0fc282bbe1	Merge dkatz@bk-internal.mysql.com:/home/bk/mysql-5.0-maint into damien-katzs-computer.local:/Users/dkatz/mysql50	19 years ago
unknown	0671a012c5	Merge damien-katzs-computer.local:/Users/dkatz/mysql50 into damien-katzs-computer.local:/Users/dkatz/mysql51 mysys/my_copy.c: Auto merged	19 years ago

1 2 3 4 5 ...

46115 Commits (1f07de22e097c6e32b29042ba45c66b2293ce952) All Branches Search

46115 Commits (1f07de22e097c6e32b29042ba45c66b2293ce952)

All Branches