summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Manual merge from mysql-5.1.Alexander Nozdrin2011-07-2210-43/+23
|\
| * Manual merge from mysql-5.0.Alexander Nozdrin2011-07-2210-72/+39
| |\
| | * For for Bug#12696072: FIX OUTDATED COPYRIGHT NOTICES IN RUNTIME RELATED CLIENTAlexander Nozdrin2011-07-2210-83/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TOOLS Backport a fix for Bug 57094 from 5.5. The following revision was backported: # revision-id: alexander.nozdrin@oracle.com-20101006150613-ls60rb2tq5dpyb5c # parent: bar@mysql.com-20101006121559-am1e05ykeicwnx48 # committer: Alexander Nozdrin <alexander.nozdrin@oracle.com> # branch nick: mysql-5.5-bugteam-bug57094 # timestamp: Wed 2010-10-06 19:06:13 +0400 # message: # Fix for Bug 57094 (Copyright notice incorrect?). # # The fix is to: # - introduce ORACLE_WELCOME_COPYRIGHT_NOTICE define to have a single place # to specify copyright notice; # - replace custom copyright notices with ORACLE_WELCOME_COPYRIGHT_NOTICE # in programs.
* | | Bug#12779790 COMPILATION FAILS OS X 10.7 - IMPLICIT DECLARATION OFJon Olav Hauglid2011-07-216-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FUNCTION 'PTHREAD_INIT' The problem was that compilation would fail with a warning: Implicit declaration of function 'pthread_init' if MySQL was compiled on OS X 10.7 (Lion). The reason was that pthread_init() is now part of an internal OS X pthread library so it was found by CMake. This patch fixes the problem by removing HAVE_PTHREAD_INIT and related code. pthread_init() was specific to MIT-pthreads which has not been supported since 4.1 and was therefore no longer relevant. No test case added.
* | | Fixed the bug number since Bug#11755949 was closed as duplicate of Bug#11753919Anitha Gopi2011-07-201-3/+3
| | |
* | | merge mysql-5.5 (local) --> mysql-5.5Alfranio Correia2011-07-208-5/+71
|\ \ \
| * | | BUG#11809016 - NO WAY TO DISCOVER AN INSTANCE IS NO LONGER A SLAVE FOLLOWING ↵Alfranio Correia2011-07-188-5/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MYSQL BUG#28796 Before BUG#28796, an empty host was used to identify that an instance was no longer a slave. However, BUG#28796 changed this behavior and one cannot set an empty host. Besides, a RESET SLAVE only cleans up information on the next event to retrieve from the master, disables ssl and resets heartbeat period. So a call to SHOW SLAVE STATUS after issuing a RESET SLAVE still returns some valid information, such as host, port, user and password. To fix this problem, we have introduced the command RESET SLAVE ALL that does what a regular RESET SLAVE does and also clears host, port, user and password information thus allowing users to identify when an instance is no longer a slave.
* | | | Bug#12756017 - PROFILING: SET_THD_PROC_INFO DOES NOT NEED TO CALL ↵Tor Didriksen2011-07-203-4/+5
| | | | | | | | | | | | | | | | DIRNAME_LENGTH EACH TIME
* | | | Merge from 5.1 the fix for Bug 12356373Inaam Rana2011-07-1911-22/+437
|\ \ \ \ | | |/ / | |/| |
| * | | Bug 12356373 - PERFORMANCE REGRESSION FROM 5.1 TO 5.5 : GROUP BY:Inaam Rana2011-07-198-7/+232
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The title of the bug is a little confusing. The actual fix is to reintroduce random readahead inside InnoDB with a dynamic, global switch innodb_random_read_ahead [default = off]. Approved by: Sunny Bains rb://696
* | | | #41836: Eventum Request to enable the mysql_embedded binarySunanda Menon2011-07-191-3/+1
| | | |
* | | | null upmergeBjorn Munch2011-07-180-0/+0
|\ \ \ \ | |/ / /
| * | | merge from 5.1-mtrBjorn Munch2011-07-181-0/+9
| |\ \ \
* | \ \ \ merge from 5.5-mtrBjorn Munch2011-07-182-1/+4
|\ \ \ \ \
| * \ \ \ \ null upmergeBjorn Munch2011-07-150-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | merge from 5.1 mainBjorn Munch2011-07-1538-711/+970
| | |\ \ \ \
| * | \ \ \ \ merge from 5.5 mainBjorn Munch2011-07-1568-786/+1198
| |\ \ \ \ \ \
| * \ \ \ \ \ \ null upmergeBjorn Munch2011-07-040-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | merge from 5.1 mainBjorn Munch2011-07-04651-1212/+3030
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ merge from 5.5 mainBjorn Munch2011-07-04879-1431/+2847
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ null upmerge 11757091Bjorn Munch2011-07-010-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Bug #11757091 49093: 5.1 CONFIGURE SCRIPT SHOULD WARN ABOUT MYSQL CLUSTER ↵Bjorn Munch2011-07-011-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT BEING MAINTAINED Added a conditional echo at end of configure.in
| * | | | | | | | | 11766640 addendum: disable unit tests in MTR with --do-test or --start-fromBjorn Munch2011-06-302-1/+4
| | | | | | | | | |
| * | | | | | | | | null upmergeBjorn Munch2011-06-290-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | merge from 5.1 mainBjorn Munch2011-06-29161-1775/+3776
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ merge from 5.5 mainBjorn Munch2011-06-29207-2250/+9098
| |\ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | Bug#12711164 - 61676: RESULT OF DIV WITH DECIMAL AND INTEGER DOES NOT MAKE ↵Tor Didriksen2011-07-183-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SENSE Truncate result of decimal division before converting to integer.
* | | | | | | | | | | | Bug#12537160 ASSERTION FAILED: STOP0 <= &TO->BUF[TO->LEN] WITH LARGE NUMBER.Tor Didriksen2011-07-183-1/+24
| |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2011-07-151-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Backport a fix for Bug#59060 (Valgrind warning in Protocol_text::store()).Alexander Nozdrin2011-07-151-2/+2
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | Automerge from mysql-5.1 into mysql-5.5.Luis Soares2011-07-151-4/+11
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | DBUG_PRINT in solaris does not work well with NULL parameters.Luis Soares2011-07-151-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | BUG#11753004Luis Soares2011-07-144-12/+301
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | Manual merge from mysql-5.1 into mysql-5.5.
| * | | | | | | | | BUG#11753004: 44360: REPLICATION FAILEDLuis Soares2011-07-144-12/+301
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | Bug#12561297 : Disabled the testAnitha Gopi2011-07-141-0/+1
| | | | | | | | | |
* | | | | | | | | | build 5.5.15MySQL Release Engineering2011-07-131-1/+1
| | | | | | | | | |
* | | | | | | | | | BUG#12695969Luis Soares2011-07-120-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | | Automerged from mysql-5.1 into mysql-5.5 (empty cset).
| * | | | | | | | BUG#12695969Luis Soares2011-07-121-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually merged from mysql-5.0 into mysql-5.1. conflicts ========= include/Makefile.am
| | * | | | | | | BUG#12695969Luis Soares2011-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-up patch that adds the newly added header file to Makefile.am noinst_HEADERS.
* | | | | | | | | BUG#12695969Luis Soares2011-07-112-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | BUG#12695969Luis Soares2011-07-112-4/+33
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually merged mysql-5.0 into mysql-5.1. conflicts ========= client/mysqlibinlog.cc
| | * | | | | | | BUG#12695969: FIX OUTDATED COPYRIGHT NOTICES IN REPLACTIONLuis Soares2011-07-112-7/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Null Merge from mysql-5.1 with second fix for Bug#12637786kevin.lewis@oracle.com2011-07-083-8/+17
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | Bug#12637786 was fixed with rb:692 by marko. But that fix has a remainingkevin.lewis@oracle.com2011-07-073-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Upmerge the 45415 fix from 5.1 to 5.5Joerg Bruehe2011-07-071-3/+14
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix bug#45415: "rpm upgrade recreates test database"Joerg Bruehe2011-07-071-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let the creation of the "test" database happen only during a new installation, not in an RPM upgrade.
* | | | | | | | | Bug#12727287: Maintainer mode compilation fails with gcc 4.6Davi Arnaut2011-07-0711-48/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | merge mysql-5.1->mysql-5.5Georgi Kodinov2011-07-071-16/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | empty weave merge from mysql-5.0Georgi Kodinov2011-07-070-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge from mysql-5.0.94-releaseSunanda Menon2011-07-0627-523/+424
| | |\ \ \ \ \ \ \