mariadb

Tree: 2e18d46b40

Author	SHA1	Message	Date
Bjorn Munch	2e18d46b40	merge from 5.5-mtr	14 years ago
Tor Didriksen	b9a929082b	Bug#12711164 - 61676: RESULT OF DIV WITH DECIMAL AND INTEGER DOES NOT MAKE SENSE Truncate result of decimal division before converting to integer.	14 years ago
Tor Didriksen	7fddcd06d2	Bug#12537160 ASSERTION FAILED: STOP0 <= &TO->BUF[TO->LEN] WITH LARGE NUMBER. Turns out the DBUG_ASSERT added by fix for Bug#11792200 was overly pessimistic: 'stop0' is used in the main loop of do_div_mod, but we only dereference 'buf0' for div operations, not for mod.	14 years ago
Bjorn Munch	49c963f5b5	null upmerge	15 years ago
Bjorn Munch	c8388f5e6c	merge from 5.5 main	15 years ago
Bjorn Munch	b2151faee8	merge from 5.1 main	15 years ago
Alexander Nozdrin	90b763ed0e	Auto-merge from mysql-5.1.	15 years ago
Alexander Nozdrin	2fe4f6bb29	Backport a fix for Bug#59060 (Valgrind warning in Protocol_text::store()). Original changeset: revision-id: alexander.nozdrin@oracle.com-20101221122349-6h8ammcro70a4pac parent: sven.sandberg@oracle.com-20101221121948-hnivuulyohzch1v4 committer: Alexander Nozdrin <alexander.nozdrin@oracle.com> branch nick: mysql-trunk-bugfixing timestamp: Tue 2010-12-21 15:23:49 +0300 message: A patch for Bug#59060 (Valgrind warning in Protocol_text::store()). We should not assume to have zero-terminated strings.	15 years ago
Luis Soares	3169e5682f	Automerge from mysql-5.1 into mysql-5.5.	15 years ago
Luis Soares	dbba17dad1	DBUG_PRINT in solaris does not work well with NULL parameters. HA_ERR was returning 0 (null string) when no error happened (error=0). Since HA_ERR is used in DBUG_PRINT, regardless there was an error or not, the server could crash in solaris debug builds. We fix this by: - deploying an assertion that ensures that the function is not called when no error has happened; - making sure that HA_ERR is only called when an error happened; - making HA_ERR return "No Error", instead of 0, for non-debug builds if it is called when no error happened. This will make HA_ERR return values to work with DBUG_PRINT on solaris debug builds.	15 years ago
Luis Soares	7168be4e59	BUG#11753004 Manual merge from mysql-5.1 into mysql-5.5.	15 years ago
Luis Soares	ce8077d8d3	BUG#11753004: 44360: REPLICATION FAILED The server crashes if it processes table map events that are corrupted, especially if they map different tables to the same identifier. This could happen, for instance, due to BUG 56226. We fix this by checking whether the table map has already been mapped before actually applying the event. If it has been mapped with different settings an error is raised and the slave SQL thread stops. If it has been mapped with same settings the event is skipped. If the table is set to be ignored by the filtering rules, there is no change in behavior: the event is skipped and ids are not checked.	15 years ago
Anitha Gopi	73340d03fc	Bug#12561297 : Disabled the test	15 years ago
MySQL Release Engineering	ae2db9b970	build 5.5.15	15 years ago
Luis Soares	d64648d83e	BUG#12695969 Automerged from mysql-5.1 into mysql-5.5 (empty cset).	15 years ago
Luis Soares	93aba6e668	BUG#12695969 Manually merged from mysql-5.0 into mysql-5.1. conflicts ========= include/Makefile.am	15 years ago
Luis Soares	eae6fde71a	BUG#12695969 Follow-up patch that adds the newly added header file to Makefile.am noinst_HEADERS.	15 years ago
Luis Soares	2014480096	BUG#12695969 Manually merged from mysql-5.1: - fixed mysqlbinlog copyright year: 2001 --> 2000 - fixed address in license header conflicts ========= - client/mysqlbinlog.cc - include/welcome_copyright_notice.h	15 years ago
Luis Soares	d3324c0098	BUG#12695969 Manually merged mysql-5.0 into mysql-5.1. conflicts ========= client/mysqlibinlog.cc	15 years ago
Luis Soares	cc17ce723a	BUG#12695969: FIX OUTDATED COPYRIGHT NOTICES IN REPLACTION CLIENT TOOLS The fix is to backport part of revision: - alexander.nozdrin@oracle.com-20101006150613-ls60rb2tq5dpyb5c from mysql-5.5. In detail, we add the oracle welcome notice header file proposed in the original patch and include/use it in client/mysqlbinlog.cc, replacing the existing and obsolete notice.	15 years ago
kevin.lewis@oracle.com	1f844faa4c	Null Merge from mysql-5.1 with second fix for Bug#12637786 Bug#12637786 was fixed with rb:692 by marko. But that fix has a remaining bug. It added this assert; ut_ad(ind_field->prefix_len); before a section of code that assumes there is a prefix_len. The patch replaced code that explicitly avoided this with a check for prefix_len. It turns out that the purge thread can get to that assert without a prefix_len because it does not use a row_ext_t* . When UNIV_DEBUG is not defined, the affect of this is that the purge thread sets the dfield->len to zero and then cannot find the entry in the index to purge. So secondary index entries remain unpurged. This patch does not do the assert. Instead, it uses 'if (ind_field->prefix_len) {...}' around the section of code that assumes a prefix_len. This is the way the patch I provided to Marko did it. The test case is simply modified to do a sleep(10) in order to give the purge thread a chance to run. Without the code change to row0row.c, this modified testcase will assert if InnoDB was compiled with UNIV_DEBUG. I tried to sleep(5), but it did not always assert.	15 years ago
kevin.lewis@oracle.com	e3fab622c2	Bug#12637786 was fixed with rb:692 by marko. But that fix has a remaining bug. It added this assert; ut_ad(ind_field->prefix_len); before a section of code that assumes there is a prefix_len. The patch replaced code that explicitly avoided this with a check for prefix_len. It turns out that the purge thread can get to that assert without a prefix_len because it does not use a row_ext_t* . When UNIV_DEBUG is not defined, the affect of this is that the purge thread sets the dfield->len to zero and then cannot find the entry in the index to purge. So secondary index entries remain unpurged. This patch does not do the assert. Instead, it uses 'if (ind_field->prefix_len) {...}' around the section of code that assumes a prefix_len. This is the way the patch I provided to Marko did it. The test case is simply modified to do a sleep(10) in order to give the purge thread a chance to run. Without the code change to row0row.c, this modified testcase will assert if InnoDB was compiled with UNIV_DEBUG. I tried to sleep(5), but it did not always assert.	15 years ago
Joerg Bruehe	61eb98d5bf	Upmerge the 45415 fix from 5.1 to 5.5	15 years ago
Joerg Bruehe	535855eb75	Fix bug#45415: "rpm upgrade recreates test database" Let the creation of the "test" database happen only during a new installation, not in an RPM upgrade.	15 years ago
Davi Arnaut	017281da24	Bug#12727287: Maintainer mode compilation fails with gcc 4.6 GCC 4.6 has new -Wunused-but-set-variable flag, which is enabled by -Wall, that causes GCC to emit a warning whenever a local variable is assigned to, but otherwise unused (aside from its declaration). Since the maintainer mode uses -Wall and -Werror, source code which triggers these warnings will be rejected. That is, these warnings become hard errors. The solution is to fix the code which triggers these specific warnings. In most of the cases, this is a welcome cleanup as code which triggers this warning is probably dead anyway.	15 years ago
Georgi Kodinov	9fc5102673	merge mysql-5.1->mysql-5.5	15 years ago
Georgi Kodinov	1219d9a1dd	empty weave merge from mysql-5.0	15 years ago
Sunanda Menon	f094b48da4	Merge from mysql-5.0.94-release	15 years ago
hery.ramilison@oracle.com	c74d844de3	Merge from mysql-5.5.14-release	15 years ago
Karen Langford	8c001894f5	Merge from mysql-5.1.58-release	15 years ago
Bjorn Munch	af5deaeec6	null upmerge	15 years ago
Bjorn Munch	fe243cde64	merge from 5.5 main	15 years ago
Bjorn Munch	f5480bff66	merge from 5.1 main	15 years ago
Jon Olav Hauglid	aabea4c044	Merge from mysql-5.1 to mysql-5.5.	15 years ago
Jon Olav Hauglid	986984a314	Fix MTR broken by last push.	15 years ago
Kent Boortz	46b1c8ae32	Updated/added copyright headers	15 years ago
Kent Boortz	0f03af653c	Updated/added copyright headers	15 years ago
Kent Boortz	56bca8baca	Updated/added copyright headers	15 years ago
Kent Boortz	b6e6097c95	Updated/added copyright headers	15 years ago
Karen Langford	a83ac4ceb2	Small update to Patch to fix SS #12698716	15 years ago
Georgi Kodinov	bc9f870fb1	merge mysql-5.1->mysql-5.5	15 years ago
Karen Langford	da7b26bb6b	Patch to fix SS #12698716 : Java/ConnectorJ regression problem	15 years ago
Bjorn Munch	afd45122b5	null upmerge 11757091	15 years ago
Bjorn Munch	be8f64ff29	Bug #11757091 49093: 5.1 CONFIGURE SCRIPT SHOULD WARN ABOUT MYSQL CLUSTER NOT BEING MAINTAINED Added a conditional echo at end of configure.in	15 years ago
Kent Boortz	7087c2e689	Updated/added copyright headers	15 years ago
Kent Boortz	9da00ebec9	Updated/added copyright headers	15 years ago
Kent Boortz	1400d7a2cc	Updated/added copyright headers	15 years ago
Kent Boortz	e5ce023f57	Updated/added copyright headers	15 years ago
Bjorn Munch	5903c66b82	11766640 addendum: disable unit tests in MTR with --do-test or --start-from	15 years ago
Marko Mäkelä	13520f4ae5	Merge mysql-5.1 to mysql-5.5.	15 years ago

1 2 3 4 5 ...

69524 Commits (2e18d46b409e5a02dc51fc1ff4b71ae4f507931f) All Branches Search

69524 Commits (2e18d46b409e5a02dc51fc1ff4b71ae4f507931f)

All Branches