summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bug 13878021 - WINDOWS PACKAGE THAT INCLUDES .PDB FILES FOR INTERMEDIATE ↵Sreedhar.S2013-10-099-20/+37
| | | | LIBRARIES USED
* (no commit message)unknown2013-10-070-0/+0
|
* Corrections of copyright headers (RE-request 45781)Kent Boortz2013-10-070-0/+0
|\
| * (no commit message)unknown2013-10-070-0/+0
| |\
* | \ (no commit message)unknown2013-10-070-0/+0
|\ \ \
| * \ \ (no commit message)unknown2013-10-060-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | (no commit message)unknown2013-10-040-0/+0
| | | |
* | | | (no commit message)unknown2013-10-070-0/+0
| | | |
* | | | Merge mysql-5.1 to mysql-5.5.Yasufumi Kinoshita2013-10-071-0/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | Bug#17431533 : FAILING ASSERTION: INDEX->PAGE != 0XFFFFFFFF AFTER DISCARDING ↵Yasufumi Kinoshita2013-10-072-0/+11
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | TABLESPACE ha_innobase::records_in_range() should return HA_POS_ERROR for the table during discarded without requesting pages. The later other handler method should treat the error correctly. Approved by Sunny in rb#3433
* | | (no commit message)unknown2013-10-070-0/+0
| | |
* | | Bug#11745656 - KILL THREAD -> ERROR: "SERVER SHUTDOWN IN PROGRESS"Praveenkumar Hulakund2013-10-051-1/+4
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Description: ------------ There are 2 issues reported in the bug report, 1. One session running a "long" select, then, from the other session, you kill that first one, while select is running, and it receives that message "Server shutdown in progress". Reported Date: 02-Apr-2006 => Looks like this isuse is already fixed in 2009 by the patch pushed for bug28141. 2. Killing query which goes to filesort, logs error entries like: 120416 9:17:28 [ERROR] mysqld: Sort aborted: Server shutdown in progress 120416 9:18:48 [ERROR] mysqld: Sort aborted: Server shutdown in progress 120416 9:19:39 [ERROR] mysqld: Sort aborted: Server shutdown in progress Reported Date: 16-Apr-2012 => This issue is introduced in 5.5+ versions. Fixing this issue in this patch. Analysis: --------- In function "filesort()", on error we are logging error message. To the error message, the message related THD::killed_errno is also appeneded, if it is set.(THD::kill_errno value is obtained by calling member function THD::killed_errno) In the scenario mentioned in this bug report, when we kill the connection, THD::kill_errno is set to the THD::KILL_CONNECTION. Enum type THD::KILL_CONNECTION corressponds to value ER_SERVER_SHUTDOWN. Because of this, "Server shutdown in ...." is appended to the message logged. Fix: ---- Modified code of "filesort()" function to append "KILL_QUERY" status to error message when thread is killed and server shutdown is not in progress.
* | (no commit message)unknown2013-10-010-0/+0
| |
* | Bug#14621190: HA_INNOBASE::INDEX_NEXT SKIPS A RECORD IF PREVIOUSMattias Jonsson2013-10-013-7/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | INDEX_READ_MAP HAD NO MATCH If index_read_map is called for exact search and no matching records exists it will position the cursor on the next record, but still having the relative position to BTR_PCUR_ON. This will make a call for index_next to read yet another next record, instead of returning the record the cursor points to. Fixed by setting pcur->rel_pos = BTR_PCUR_BEFORE if an exact [prefix] search is done, but failed. Also avoids optimistic restoration if rel_pos != BTR_PCUR_ON, since btr_cur may be different than old_rec. rb#3324, approved by Marko and Jimmy
* | Bug #16619754 - MYSQL_INSTALL_DB.PL FAILS TO CREATE DATABASE ON WINDOWS.Sreedhar.S2013-09-301-15/+8
| | | | | | | | As this mysql_install_db.pl file has always generated lots of confusion on Windows. This fix will make sure to get it removed only from Windows
* | Fix for Bug:16053094Sreedhar.S2013-09-301-15/+27
| | | | | | | | Registry redirection was improper and hence not able to pick the value for the OLDERVERSION property. as a result in the install upgrade dialog null value wa being passed.
* | Fix to copy missing pdb files BUG 13878021Sreedhar.S2013-09-301-0/+21
| |
* | Adjustment for fix for Bug#11758196Yasufumi Kinoshita2013-09-301-0/+1
| | | | | | | | | | log_buffer_extend() should fill the new buffer with 0.
* | Bug#11758196 : INNODB ASSERTION FAILURE WHEN CONVERTING FROM MYISAM TO INNODBYasufumi Kinoshita2013-09-302-1/+110
| | | | | | | | | | | | | | Changed to try to extend log buffer instead of crash, when log size is too large for the size. Approved by Marko in rb#3229
* | Merge fix for BUG#17446090 from mysql-5.1 to mysql-5.5Satya Bodapati2013-09-274-10/+22
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | The testcase for this bug fails randomly due to two reasons. 1. Due to ibuf merge happening background 2. Due to dict stats update which brings the evicted page back into buffer pool. Fix ibuf_contract_ext() to not do any merges with ibuf_debug enabled and also changed dict_stats_update() to return fake statistics without bringing the secondary index pages into buffer pool. Approved by Marko. rb#3419
| * (no commit message)unknown2013-09-270-0/+0
| |
* | BUG#16580366- MTR TESTS FAILING SPORADICALLY ON PB2 (5.5, 5.6 AND 5.7)Shivji Kumar Jha2013-09-2718-5/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DURING INNODB RECOVERY Problem: ======= The connection 'master' is dropped by mysqltest after rpl_end.inc. At this point, dropping temporary tables at the connection 'master' are not synced at slave. So, the temporary tables replicated from master remain on slave leading to an inconsistent close of the test. The following test thus complains about the presence of temporary table(s) left over from the previous test. Fix: === - Put explicit drop commands in replication tests so that the temporary tables are dropped at slave as well. - Added the check for Slave_open_temp_tables in mtr_check.sql to warn about the remaining temporary table, if any, at the close of a test.
* | Bug#17327454:SEMI-SYNC REPLICATION MASTER CRASH WHEN SETSujatha Sivakumar2013-09-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RPL_SEMI_SYNC_MASTER_ENABLED OFF. Problem: ======= If master is waiting for a reply from slave, at this time set global rpl_semi_sync_master_enabled=OFF, the master server will crash. Analysis: ======== When master is waiting for a reply from slave, at this time if semi sync is switched off on master, during switch off if active transactions are present the transactions will be cleared and "active_tranxs_" variable will be set to NULL. When the waiting master connection finds that semi sync is switched of it tries to access "active_tranxs_" without checking if the transaction list exists or not. Accessing NULL transaction list causes the crash. Fix: === A check has been added to see a valid list exists before accessing the "active_tranxs_". plugin/semisync/semisync_master.cc: Added check for the existence of valid 'active_transx_'.
* | Upmerge of the 5.1.72 buildHery Ramilison2013-09-200-0/+0
|\ \ | |/
| * Merge from mysql-5.1.72-releaseunknown2013-09-201-1/+5
| |\
| | * Reverted the changes to spec file to ignore mysqld_safe.pid file, updated ↵Balasubramanian Kandasamy2013-09-091-3/+3
| | | | | | | | | | | | the logic to get the correct count of PID files
| | * Committing patch from venkata.sidagam@oracle.com for Bug#16776528 Hery Ramilison2013-09-092-33/+1
| | |
| | * Fixing sles11 build that /usr/lib/mysql/plugin is not owned by a packageHery Ramilison2013-09-031-0/+1
| | |
| | * Fix to ignore mysqld_safe.pidBalasubramanian Kandasamy2013-08-301-2/+2
| | |
| | * Fix for Bug#17377159, ignore mysqld_safe.pid file created by mysqld_safe scriptBalasubramanian Kandasamy2013-08-291-1/+4
| | |
* | | Bug#17435338 ADD A -DWITH_ASAN SWITCH/OPTION TO OUR CMAKE SCRIPTSTor Didriksen2013-09-201-1/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | Tested with: gcc (GCC) 4.8.1 20130603 (Red Hat 4.8.1-1) clang version 3.1 (tags/RELEASE_31/final) Target: x86_64-apple-darwin10.8.0
* | | Merge from mysql-5.5.34-releaseunknown2013-09-201-1/+4
|\ \ \
| * | | Reverted the changes to spec file, updated the logic to get the correct ↵Balasubramanian Kandasamy2013-09-091-3/+3
| | | | | | | | | | | | | | | | count of PID files
| * | | Bug #16776528 RACE CONDITION CAN CAUSE MYSQLD TO REMOVE SOCKET FILE ERRANTLYVenkata Sidagam2013-09-091-32/+0
| | | | | | | | | | | | | | | | Reverting the patch. Because this change is not to me made for GA versions.
| * | | Fix to ignore mysqld_safe.pidBalasubramanian Kandasamy2013-08-301-2/+2
| | | |
| * | | Corrected the PID_FILE_PATT manipulationBalasubramanian Kandasamy2013-08-301-2/+2
| | | |
| * | | Fix for Bug#17377159, ignore mysqld_safe.pid file created by mysqld_safe scriptBalasubramanian Kandasamy2013-08-291-2/+5
| | | |
* | | | Making rpl.rpl_spec_variables experimental for solaris till bug#17337114 is ↵Vinay Fisrekar2013-09-191-0/+1
| | | | | | | | | | | | | | | | fixed.
* | | | Bug#16765410 FTS: STACK AROUND THE VARIABLE 'MYSTR' WAS CORRUPTED IN ↵Tor Didriksen2013-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | INNOBASE_STRNXFRM my_strnxfrm_win1250ch could write into dest[destlen] i.e. write a byte to the past-the-end of dest.
* | | | post-push fix for bug#53947Mattias Jonsson2013-09-126-36/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | test change only. Removed --source include/not_windows_embedded.inc which was added due to that bug.
* | | | Fix FreeBSD build failure due to BUG#16752251 (only in 5.5)Satya Bodapati2013-09-121-0/+1
| | | |
* | | | Merge additional fix for BUG#16752251 from mysql-5.1 to mysql-5.5Satya Bodapati2013-09-121-0/+66
|\ \ \ \ | | |/ / | |/| |
| * | | Additional Fix to BUG#16755251 for 5.1 build failure and Satya Bodapati2013-09-124-4/+3
| | | | | | | | | | | | | | | | | | | | disable testcase due to BUG#17446090
* | | | Bug#16482467 ORDER BY IGNORED IN SOME SITUATIONS FOR UPDATE QUERYTor Didriksen2013-09-101-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For queries like update t1 set ... where <unique key> order by ... limit ... we need to handle the fact that unique keys allow NULL values, and hence can return more than one row. sql/opt_range.cc: When the unique key has multiple key parts, check each key_part for nullability, rather than the first key part. (s/key->part ==/key_tree->part ==/) Also: revert the if() test, for better readability.
* | | | Merge fix for BUG#16752251 from mysql-5.1 to mysql-5.5Satya Bodapati2013-09-113-9/+54
|\ \ \ \ | |/ / /
| * | | Bug#16752251 - INNODB DOESN'T REDO-LOG INSERT BUFFER MERGE OPERATION IFSatya Bodapati2013-09-118-17/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IT IS DONE IN-PLACE With change buffer enabled, InnoDB doesn't write a transaction log record when it merges a record from the insert buffer to an secondary index page if the insertion is performed as an update-in-place. Fixed by logging the 'update-in-place' operation on secondary index pages. Approved by Marko. rb#2429
* | | | Bug #16978278 : BUFFER OVERFLOW WHEN PRINTING A LARGE 64-BIT INTEGERmithun2013-09-101-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | WITH MY_B_VPRINTF() [Merge from 5.1]
| * | | Bug #16978278 : BUFFER OVERFLOW WHEN PRINTING A LARGE 64-BIT INTEGERmithun2013-09-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WITH MY_B_VPRINTF() Issue : In LP 64 machine max long value can be 20 digit decimal value. But in my_b_vprintf() the intermediate buffer storage used is 17 bytes length. This will lead to buffer overflow. Solution : Increased the buffer storage from 17 to 32 bytes. code is backported from 5.6 mysys/mf_iocache2.c: In function my_b_vprintf increased the size of local buff from 17 to 32 bytes.
* | | | Null MergeLibing Song2013-09-100-0/+0
|\ \ \ \ | |/ / /
| * | | Bug#17402313 DUMP THREAD SENDS SOME EVENTS MORE THAN ONCELibing Song2013-09-102-0/+2
| | | | | | | | | | | | | | | | Postfix, suppress the new warning generated by the bug's fix.