mariadb

Tree: b1e1f77f1f

Author	SHA1	Message	Date
unknown	7c08621c5a	Merge mysql.com:/home/gluh/MySQL/Merge/4.1 into mysql.com:/home/gluh/MySQL/Merge/4.1-opt sql/item_func.cc: Auto merged	19 years ago
unknown	3609c3a4a3	Fixed bug #25931 . View check option clauses were ignored for updates of multi-table views when the updates could not be performed on fly and the rows to update had to be put into temporary tables first. mysql-test/r/view.result: Added a test case for bug #25931. mysql-test/t/view.test: Added a test case for bug #25931. Adjusted another existed test case to have the correct result. sql/sql_update.cc: Fixed bug #25931. View check option clauses were ignored for updates of multi-table views when the updates could not be performed on fly and the rows to update had to be put into temporary tables first. Added the required check to multi_update::do_updates to fix the problem.	19 years ago
unknown	75d614e053	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 into poseidon.mysql.com:/home/tomas/mysql-4.1-ndb	19 years ago
unknown	1daa0e4435	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb sql/ha_ndbcluster.cc: Auto merged	19 years ago
unknown	780e60af03	Avoid problem with "noinst_HEADERS" being sucked into "mysqld_LDADD" if openssl_libs and yassl_libs are empty strings	19 years ago
unknown	1c3b070772	Merge trift2.:/MySQL/M50/mysql-5.0 into trift2.:/MySQL/M50/push-5.0	19 years ago
unknown	a11fb9ebc4	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	7d678ab9d6	Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb ndb/include/ndbapi/NdbIndexScanOperation.hpp: Auto merged ndb/include/ndbapi/NdbScanOperation.hpp: Auto merged ndb/src/ndbapi/NdbScanOperation.cpp: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_ndbcluster.h: Auto merged	19 years ago
unknown	c8f470eaa6	NdbScanOperation.hpp, NdbScanOperation.cpp, ha_ndbcluster.cc: bug#25821 Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound ha_ndbcluster.h: Removed stray mthod declaration sql/ha_ndbcluster.h: Removed stray mthod declaration ndb/include/ndbapi/NdbScanOperation.hpp: bug#25821 Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound ndb/src/ndbapi/NdbScanOperation.cpp: bug#25821 Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound sql/ha_ndbcluster.cc: bug#25821 Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound	19 years ago
unknown	f3463a8c82	bug#25821 Excessive partition pruning for multi-range index scan in NDB API: post-review fix, added default value	19 years ago
unknown	3a54e5930d	Fixed bug #26124 : SELECT from a view wrapper over a table with a column of the DATETIME type could return a wrong result set if the WHERE clause included a BETWEEN condition on the column. Fixed the method Item_func_between::fix_length_and_dec where the aggregation type for BETWEEN predicates calculated incorrectly if the first argument was a view column of the DATETIME type. mysql-test/r/view.result: Added a test case for bug #26124. mysql-test/t/view.test: Added a test case for bug #26124.	19 years ago
unknown	ba8a684dcb	Fix for bug#25821 Excessive partition pruning for multi-range index scan in NDB API: don't set distribution key if multi_range	19 years ago
unknown	b3d96f7972	Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint extra/perror.c: Auto merged	19 years ago
unknown	0554802f3c	Merge 192.168.0.10:mysql/mysql-4.1-maint into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint	19 years ago
unknown	665d9e30fb	Bug#25344 Segmentation violation when try to run the perror utility - strerror might return NULL on some platforms extra/perror.c: Backport fix from 5.0	19 years ago
unknown	976f0a391c	Bug#19978: INSERT .. ON DUPLICATE erroneously reports some records were updated. INSERT ... ON DUPLICATE KEY UPDATE reports that a record was updated when the duplicate key occurs even if the record wasn't actually changed because the update values are the same as those in the record. Now the compare_record() function is used to check whether the record was changed and the update of a record reported only if the record differs from the original one. sql/sql_update.cc: Bug#19978: INSERT .. ON DUPLICATE erroneously reports some records were updated. The compare_record() function was changed to non-static one. sql/sql_insert.cc: Bug#19978: INSERT .. ON DUPLICATE erroneously reports some records were updated. Now the compare_record() function is used to check whether the record was changed and the update of a record reported only if the record differs from the original one. sql/mysql_priv.h: Bug#19978: INSERT .. ON DUPLICATE erroneously reports some records were updated. Added the prototype of the compare_record() function. mysql-test/t/insert_select.test: Added a test case for bug#19978: INSERT .. ON DUPLICATE erroneously reports some records were updated. mysql-test/r/insert_select.result: Added a test case for bug#19978: INSERT .. ON DUPLICATE erroneously reports some records were updated.	19 years ago
unknown	61d638f01e	Merge 192.168.0.5:mysql/bug25203/my50-bug25203 into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint vio/vio.c: Auto merged vio/viossl.c: Auto merged	19 years ago
unknown	30e01d9eea	Merge bk-internal:/home/bk/mysql-5.0-maint into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint	19 years ago
unknown	630091fed4	copy from test-extra-5.0 to main tree BitKeeper/etc/ignore: Added mysql-test/mysql-test-run-shell to the ignore list mysql-test/suite/funcs_2/include/check_charset.inc: finished files with newline	19 years ago
unknown	0cab1b1494	Merge 192.168.0.10:mysql/yassL-import/my50-yassL-import into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint vio/viosslfactories.c: Auto merged	19 years ago
unknown	5ccb23ae89	Bug#24157 openssl_1 regression test is broken two different ways - Send output from 'ERR_print_errors_fp' to DBUG_FILE if --debug is used vio/viosslfactories.c: Send output from 'ERR_print_errors_fp' to DBUG_FILE if --debug is used	19 years ago
unknown	38ae09760b	Correct the non working check for --skip-log-bin in "extra_opt"	19 years ago
unknown	2544aa7b9f	Bug#25988 openssl_1 Test Case Fails - Small difference in output from 'X509_NAME_Oneline' between OpenSSL and yaSSL. OpenSSL uses an extension that allow's the email adress of the cert holder. - Imported patch for yaSSL "add email to DN output" extra/yassl/taocrypt/src/asn.cpp: Import patch yassl.diff mysql-test/r/openssl_1.result: Update result file mysql-test/t/openssl_1.test: Update test to include "emailAddress=" tag in the required SUBJECT for grant.	19 years ago
unknown	56e9231f65	Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/range.result: Auto merged mysql-test/t/range.test: Auto merged mysys/default.c: Auto merged scripts/mysqld_multi.sh: Auto merged sql/field.h: Auto merged sql/item_timefunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Merfge backport	19 years ago
unknown	dcafc4c480	Merge 192.168.0.10:mysql/mysql-5.0-maint into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint mysql-test/mysql-test-run.pl: Auto merged sql/item_timefunc.cc: Auto merged	19 years ago
unknown	56820e1cdc	Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint Makefile.am: Auto merged configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysys/default.c: Auto merged sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged mysql-test/r/select.result: Manual merge mysql-test/t/select.test: Manual merge	19 years ago
unknown	31aee856d8	Merge 192.168.0.10:mysql/mysql-4.1-maint into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint mysys/default.c: Auto merged sql/mysqld.cc: Auto merged sql/sql_prepare.cc: Auto merged	19 years ago
unknown	b93d81a8d1	Merge neptunus.(none):/home/msvensson/mysql/my41-nmj into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint sql/sql_prepare.cc: Auto merged	19 years ago
unknown	14e7f52fb2	Merge pilot.mysql.com:/home/msvensson/mysql/bug24805/my50-bug24805 into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/disabled.def: Auto merged	19 years ago
unknown	4660f6d5ef	Merge bk-internal:/home/bk/mysql-4.1-maint into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint	19 years ago
unknown	f58351c158	Merge 192.168.0.10:mysql/mysql-4.1-maint into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint sql/sql_prepare.cc: Auto merged	19 years ago
unknown	04b5225122	Bug#24805 mtr.pl can't handle test with --disable-log-bin - Don't give mysqld the --log-bin argument if .opt file contains --skip-log-bin - Enable flush2 test mysql-test/mysql-test-run.pl: Don't give mysqld the --log-bin argument if .opt file contains --skip-log-bin Don't pass mysqld --binlog-format=s if --skip-log-bin mysql-test/t/disabled.def: Enable flush2 mysql-test/t/flush2-master.opt: Use --skip-log-bin in flush2 to test flush without bin logging	19 years ago
unknown	ffde1cf09c	Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint into mysql.com:/home/ram/work/b23782/b23782.5.0 sql/sql_analyse.cc: Auto merged	19 years ago
unknown	1d2d9a033d	Bug#8983 one place that isn't strict-aliasing-safe - Backport fix from 5.0 sql/sql_prepare.cc: Avoid problems with -no-strict-aliasing in gcc 4.0+	19 years ago
unknown	07efbe8c2a	Fix for bug #23782 : Stored procedures: crash if variable in procedure analyse We have to call fix_fields() for procedure analyse' arguments as they may not be fixed in some circumstances. (as the crash appears when mysqld starts skipping binlog, a test case will be added when we can --skip-bin-log in -master.opt) sql/sql_analyse.cc: Fix for bug #23782: Stored procedures: crash if variable in procedure analyse - call fix_fields() if arguments are not fixed.	19 years ago
unknown	70323365c1	Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint into mysql.com:/usr/home/ram/work/bug23938/my41-bug23938 sql/item_timefunc.cc: Auto merged	19 years ago
unknown	e976ea37b0	Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint into mysql.com:/usr/home/ram/work/bug23938/my50-bug23938 sql/item_timefunc.cc: Auto merged	19 years ago
unknown	61b286e416	Merge mysql.com:/usr/home/ram/work/bug23938/my41-bug23938 into mysql.com:/usr/home/ram/work/bug23938/my50-bug23938 sql/item_timefunc.cc: Auto merged mysql-test/r/cast.result: SCCS merged mysql-test/t/cast.test: SCCS merged	19 years ago
unknown	c35ceeca9e	Bug #22344 : InnoDB keys act strange on datetime vs timestamp comparison Ignoring error codes from type conversion allows default (wrong) values to go unnoticed in the formation of index search conditions. Fixed by correctly checking for conversion errors. mysql-test/r/select.result: Bug #22344: InnoDB keys act strange on datetime vs timestamp comparison - test case mysql-test/t/select.test: Bug #22344: InnoDB keys act strange on datetime vs timestamp comparison - test case sql/field.h: Bug #22344: InnoDB keys act strange on datetime vs timestamp comparison - don't ignore coversion errors sql/field_conv.cc: Bug #22344: InnoDB keys act strange on datetime vs timestamp comparison - don't ignore coversion errors sql/item.cc: Bug #22344: InnoDB keys act strange on datetime vs timestamp comparison - don't ignore coversion errors	19 years ago
unknown	9946ed16f3	Test and bug fixes and removed unneccessary files. mysys/my_getopt.c: Fixes problem with getting output lines from my_getopt in random places in tests. sql/sql_prepare.cc: Fixes problem with failing mysql_client_test on some machines. This is actually a problem with prepared statements.	19 years ago
unknown	30edb3cd0f	Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint into mysql.com:/usr/home/ram/work/bug10798/my41-bug10798 sql/slave.cc: Auto merged	19 years ago
unknown	cbace0b7b4	Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint into mysql.com:/usr/home/ram/work/bug10798/my50-bug10798 sql/slave.cc: Auto merged	19 years ago
unknown	f27ea1b152	Merge mysql.com:/usr/home/ram/work/bug10798/my41-bug10798 into mysql.com:/usr/home/ram/work/bug10798/my50-bug10798 sql/slave.cc: merging	19 years ago
unknown	1534bb792b	Merge olga.mysql.com:/home/igor/mysql-5.0-opt into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug24035	19 years ago
unknown	d3c1511a36	After merge fix	19 years ago
unknown	e0d8e8fd09	Fix bug #24035 . This performance degradation for UPDATEs could be observed in the update statements for which the search key cannot be converted to any valid value of the type of the search column, like for a the condition int_fld=99999999999999999999999999, though it can be guaranteed here that there is no row with such a key value. mysql-test/r/update.result: Added a test case for bug #24035. mysql-test/t/update.test: Added a test case for bug #24035. sql/opt_range.cc: Fix bug #24035. This performance degradation for could be observed in the update statements for which the search key cannot be converted to any valid value of the type of the search column, like for a the condition int_fld=99999999999999999999999999, though it can be guaranteed here that there is no row with such a key value. Now the function get_mm_leaf creates trees of the type SEL_ARG::IMPOSSIBLE for such conditions that tells the range scan not to perform any search at all.	19 years ago
unknown	8a9c521bba	Merge chilla.local:/home/mydev/mysql-4.1-axmrg into chilla.local:/home/mydev/mysql-5.0-axmrg sql/handler.cc: Auto merged sql/examples/ha_tina.cc: Auto merged sql/examples/ha_tina.h: Auto merged sql/mysqld.cc: Auto merged mysql-test/Makefile.am: Manual merged	19 years ago
unknown	3c0aca02fe	Merge bk-internal.mysql.com:/home/bk/mysql-5.0 into chilla.local:/home/mydev/mysql-5.0-axmrg sql/item_func.cc: Auto merged	19 years ago
unknown	0dc19dadb9	Merge bk-internal.mysql.com:/home/bk/mysql-4.1 into chilla.local:/home/mydev/mysql-4.1-axmrg	19 years ago
unknown	98b9ac693a	After merge fix	19 years ago

1 2 3 4 5 ...

34871 Commits (b1e1f77f1ffcbd1f3f9d07d8da598061ea2cb75c) All Branches Search

34871 Commits (b1e1f77f1ffcbd1f3f9d07d8da598061ea2cb75c)

All Branches