summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Upmerging the changes for Bug 16395495 from 5.1Murthy Narkedimilli2013-03-190-0/+0
|\
| * Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-191617-1682/+1686
| |
* | Fix Bug#16400412 UNNECESSARY DICT_UPDATE_STATISTICS DURING CONCURRENTVasil Dimov2013-03-186-28/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | UPDATES After checking that the table has changed too much in row_update_statistics_if_needed() and calling dict_update_statistics(), also check if the same condition holds after acquiring the table stats latch. This is to avoid multiple threads concurrently entering and executing the stats update code. Approved by: Marko (rb:2186)
* | Upmerging the changes for Bug 16401147 from 5.1Murthy Narkedimilli2013-03-190-0/+0
|\ \ | |/
| * Bug 16401147 - CRLF INSTEAD OF LF IN READMEMurthy Narkedimilli2013-03-191-56/+56
| |
* | Bug 16401147 - CRLF INSTEAD OF LF IN READMEMurthy Narkedimilli2013-03-191-56/+56
| |
* | merge from mysql-5.1 to mysql-5.5Sujatha Sivakumar2013-03-181-15/+31
|\ \ | |/
| * Bug#14771299 OUT-OF-BOUND READS WRITE IN MYSQLBINLOGSujatha Sivakumar2013-03-181-15/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: ======= Found using AddressSanitizer testing. The mysqlbinlog utility may result in out-of-bound heap buffer reads and thus, undefined behaviour, when processing RBR events in the old (pre-5.1 GA) format. The following code in process_event() would only be correct if Rows_log_event was the base class for Write,Update,Delete_rows_log_event_old classes: case PRE_GA_WRITE_ROWS_EVENT: case PRE_GA_DELETE_ROWS_EVENT: case PRE_GA_UPDATE_ROWS_EVENT: ... Rows_log_event *e= (Rows_log_event*) ev; Table_map_log_event *ignored_map= print_event_info->m_table_map_ignored.get_table(e->get_table_id()); ... if (e->get_flags(Rows_log_event::STMT_END_F)) { ... } However, Rows_log_event is only the base class for the Write,Update_Delete_rows_event family of classes, but not for their *_old counterparts. So the above typecasts are incorrect for the old-format RBR events and may result (and do result according to AddressSanitizer reports) in reading memory outside of the previously allocated on heap buffer. Fix: === The above mentioned invalid type cast has been replaced with appropriate old counterpart. Note:The above mentioned issue is present only mysql-5.1 and 5.5. This is fixed in mysql-5.6 and above as part of Bug#55790. Hence few of the relevant changes of Bug#55790 are being back ported to fix the current issue. client/mysqlbinlog.cc: The above mentioned invalid type cast of using new event object to read old events, has been replaced with appropriate old counterpart. Note:The above mentioned issue is present only mysql-5.1 and 5.5. This is fixed in mysql-5.6 and above as part of Bug#55790. Hence few of the relevant changes of Bug#55790 are being back ported to fix the current issue.
* | Bug #16076289 : BACKPORT FIX FOR BUG #14786792 TO 5.5Neeraj Bisht2013-03-182-7/+46
| | | | | | | | | | | | Backport the changes for bug#14786792 which is regression of fix for bug#11761854.So backported both changes.
* | Merge of patch for bug#14685362 from mysql-5.1.Nirbhay Choubey2013-03-182-2/+20
|\ \ | |/
| * Bug#14685362 : MEMORY LEAKS IN MYSQL CLIENT INNirbhay Choubey2013-03-181-2/+18
| | | | | | | | | | | | | | | | | | | | | | INTERACTIVE MODE In interactive mode, libedit/readline allocates memory for every new line entered & later the allocated memory never gets freed. Fixed by freeing the allocated memory blocks appropriately.
* | Bug#16056813-MEMORY LEAK ON FILTERED SLAVEVenkatesh Duggirala2013-03-150-0/+0
|\ \ | |/ | | | | Null merge from mysql-5.1
| * Bug#16056813-MEMORY LEAK ON FILTERED SLAVEVenkatesh Duggirala2013-03-151-1/+2
| | | | | | | | | | | | | | Back porting fix from mysql-5.5 sql/rpl_utility.cc: Resetting last_added to NULL to avoid memory leak
* | Bug#16359402 CRASH WITH AGGREGATES: ASSERTION FAILED: N < M_SIZETor Didriksen2013-03-142-11/+27
| | | | | | | | | | | | | | | | We need to take 'n_sum_items' into the calculation when allocating the ref_ptr_array.
* | 5.1 -> 5.5 mergeSergey Glukhov2013-03-141-1/+8
|\ \ | |/
| * Bug#16075310 SERVER CRASH OR VALGRIND ERRORS IN ↵Sergey Glukhov2013-03-141-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ITEM_FUNC_GROUP_CONCAT::SETUP AND ::ADD Item_func_group_concat::copy_or_same() creates a copy of original object. It also creates a copy of ORDER structure because ORDER struct elements may be modified in find_order_in_list() called from Item_func_group_concat::setup(). As ORDER copy is created using memcpy, ORDER::next elements point to original ORDER structs. Thus find_order_in_list() called from EXECUTE stmt modifies ordinal ORDER item pointers so they point to runtime items, these items are freed after execution, so original ORDER structure becomes invalid. The fix is to properly update ORDER::next fields so that they point to new ORDER elements. sql/item_sum.cc: update ORDER::next fields so that they point to new ORDER elements.
* | BUG#14593883-REPLICATION BREAKS WHEN SET DATA TYPE Venkatesh Duggirala2013-03-131-1/+2
|\ \ | |/ | | | | | | COLUMNS ARE USED INSIDE A STORED PROCEDURE Merging post-push fix from mysql-5.1
| * BUG#14593883-REPLICATION BREAKS WHEN SET DATA TYPE Venkatesh Duggirala2013-03-131-1/+2
| | | | | | | | | | | | | | | | COLUMNS ARE USED INSIDE A STORED PROCEDURE Post-push fix. String::operator=() in client/sql_string.h also needs to be updated with fix.
* | Bug#16268289 LOCK_REC_VALIDATE_PAGE() MAY DEREFERENCE A POINTER TO AAditya A2013-03-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FREED LOCK ANALYIS ------- In 5.5 code the lock_rec_block_validate() is called after releasing the kernel mutex. There is a chance that the lock might be invalid so, we are getting the valgrind error on invalid read on lock->index. FIX --- Fix would be to copy the lock->index when we are holding the kernel mutex and then pass it to the lock_rec_block_validate(). This implementation is present in 5.1 code. [ Approved by sunny rb.no.oracle.com/rb/r/2152/ ]
* | Bug#16084346: SSL_CONNECT_DEBUG.TEST FAILURE IN 5.1Harin Vadodaria2013-03-130-0/+0
|\ \ | |/ | | | | Description: Null merge from 5.1.
| * (no commit message)unknown2013-03-130-0/+0
| |
* | BUG#14593883-REPLICATION BREAKS WHEN SET DATA TYPE Venkatesh Duggirala2013-03-121-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | COLUMNS ARE USED INSIDE A STORED PROCEDURE Problem: When 'SET' type columns are used in a DML inside a stored procedure and a NULL value is passed to that column, replication is breaking. Analysis: All stored procedure variables used inside a DML will be substituted with NAME_CONST functions. While NAME_CONST are used in this particular scenario, i.e., when NULL value is passed then charset is copied from 'empty_set_string' member of Field_set class. The operator '=' overload method inside 'String' class is not coping str_charset from R.H.S object to L.H.S object. Hence charset is wrongly copied in the string assignment Fix: Handle coping str_charset member in operator '=' overload method. sql/sql_string.h: Handled coping str_charset member in operator '=' overload method.
| * BUG#14593883-REPLICATION BREAKS WHEN SET DATA TYPE Venkatesh Duggirala2013-03-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | COLUMNS ARE USED INSIDE A STORED PROCEDURE Problem: The operator '=' overload method inside 'String' class is not coping str_charset member from R.H.S object to L.H.S object. Hence charset is wrongly set while using string assignments Analaysis: The above mentioned problem is identified while doing the analaysis of bug#14593883. Though the test scenario mentioned in the bug page is not an issue in mysql-5.1 code, the actual root cause ie., "str_charset member is not copied" exists in the mysql-5.1 code base. Fix: Handle coping str_charset member in operator '=' overload method. sql/sql_string.h: Handled coping str_charset member in operator '=' overload method.
* | Bug#16409715 ASSERT SYNC_THREAD_LEVELS_G(ARRAY, LEVEL - 1, TRUE),Marko Mäkelä2013-03-121-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | IBUF, FREE SPACE MANAGEMENT ibuf_merge_or_delete_for_page(): Declare the user index page latched for UNIV_SYNC_DEBUG after opening the change buffer cursor. This should avoid the bogus latching order violation. ibuf_delete_rec(): Add assertions to the callers, checking that the mini-transaction was committed when the function returned TRUE. This is a non-functional change, just clarifying the code. rb#2136 approved by Kevin Lewis
* | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2013-03-122-24/+12
|\ \ | |/
| * Bug#16463505 PESSIMISTIC PAGE_ZIP_AVAILABLE() MAY CAUSE INFINITE PAGE SPLITMarko Mäkelä2013-03-123-24/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For a fresh insert, page_zip_available() was counting some fields twice. In the worst case, the compressed page size grows by PAGE_ZIP_DIR_SLOT_SIZE plus the size of the record that is being inserted. The size of the record already includes the fields that will be stored in the uncompressed portion of the compressed page. page_zip_get_trailer_len(): Remove the output parameter entry_size, because no caller is interested in it. page_zip_max_ins_size(), page_zip_available(): Assume that the page grows by PAGE_ZIP_DIR_SLOT_SIZE and the record size (which includes the fields that would be stored in the uncompressed portion of the page). rb#2169 approved by Sunny Bains
| * (no commit message)unknown2013-03-120-0/+0
| |
* | Bug#11766815 INVALID SYSTEM CHECK TIME_T_UNSIGNEDTor Didriksen2013-03-111-2/+2
| | | | | | | | | | | | | | | | | | The check for unsigned time_t failed, on all platforms, due to missing #include. from CMakeFiles/CMakeError.log with this patch: error: size of array array is negative without this patch: error: time_t undeclared (first use in this function)
* | (no commit message)unknown2013-03-110-0/+0
| |
* | (no commit message)unknown2013-03-080-0/+0
| |
* | BUG#16069598 - SERVER CRASH BY NULL POINTER DEREFERENCING IN Aditya A2013-03-071-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MEM_HEAP_CREATE_BLOCK() PROBLEM ------- If we give start mysqld with the option --innodb_log_buffer_size=50GB ,then mem_area_alloc() function fails to allocate memory and returns NULL.In debug version we assert at this point,but there is no check in release version and we get a segmentation fault. FIX --- Added a log message saying that we are unable to allocate memory. After this message we assert. [Approved by Kevin http://rb.no.oracle.com/rb/r/2065 ]
* | Bug#11765489 CMAKE BUILD ON MAC OS X DOES NOT DETERMINE CPU TYPETor Didriksen2013-03-011-5/+13
| | | | | | | | | | | | | | | | Don't use CMAKE_OSX_ARCHITECTURES to determine DEFAULT_MACHINE if it is not defined. If we're 64bit, then use "x86_64" rather than "x86"
* | Bug#16169063: SECURITY CONCERN BECAUSE OF INSUFFICIENT LOGGINGAshish Agarwal2013-03-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | PROBLEM: If multiple statements are sent by a single request then only the last statement was getting logged. An attacker can bypass the audit log just by sending two comsecutive statements in one request. SOLUTION: Each statements from a single request are logged.
* | Bug #16133801 UNEXPLAINABLE INNODB UNIQUE INDEX LOCKS ON DELETE +Annamalai Gurusami2013-03-061-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | INSERT WITH SAME VALUES Problem: When a transaction is in READ COMMITTED isolation level, gap locks are still taken in the secondary index, when row is inserted. This happens when the secondary index is scanned for duplicate. The function row_ins_scan_sec_index_for_duplicate() always calls the function row_ins_set_shared_rec_lock() with LOCK_ORDINARY irrespective of the transaction isolation level. Solution: The function row_ins_scan_sec_index_for_duplicate() calls the function row_ins_set_shared_rec_lock() with LOCK_ORDINARY or LOCK_REC_NOT_GAP based on the transaction isolation level. rb://2035 approved by Krunal and Marko
* | NULL Merge for release 5.1.69unknown2013-03-060-0/+0
|\ \ | |/
| * Raise version number after cloning 5.1.69unknown2013-03-051-1/+1
| |
* | Bug#16068056 INNODB CALLS BUF_VALIDATE() TOO OFTEN WITH UNIV_DEBUGInaam Rana2013-03-051-3/+3
| | | | | | | | | | | | | | Approved by: Marko Makela (patch in bug report) Reduce the number of debug buf_validate() calls
* | Raise version number after cloning 5.5.31unknown2013-03-051-1/+1
| |
* | L0ocal mergeMarc Alff2013-03-013-10/+15
|\ \
| * | BUG#11753923-SQL THREAD CRASHES ON DISK FULLVenkatesh Duggirala2013-03-012-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing post push issue Simulator name used needs to be changed to make it work properly. Analysis: Debug control list addition (ListAddDel function dbug.c file) code was written in such a way that if new element is subset of already existing element, then the new element is not added. i.e., set @@global.debug = '+d,abcd', is existing in the list then you cannot add "a" or "ab" or "abc" in the list.
| * | Bug#16385711: HANDLER, CREATE TABLE IF NOT EXISTS,Jon Olav Hauglid2013-02-281-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PROBLEM AFTER MYSQL_HA_FIND This problem occured if a prepared statement tried to create a table for which there already existed a view with the same name while a SQL handler was opened. Before DDL statements are executed, mysql_ha_rm_tables() is called to remove any matching tables from the internal list of opened SQL handler tables. This match was done on TABLE_LIST::db and TABLE_LIST::table_name. This is problematic for views (which use TABLE_LIST::view_db and TABLE_LIST::view_name) and anonymous derived tables. This patch fixes the problem by skipping TABLE_LISTs representing anonymous derived tables and using get_db_name()/get_table_name() which handles views when looking for SQL handler tables to remove.
* | | Bug#16414644 ASSERTION FAILED: SIZE == PFS_ALLOCATED_MEMORYMarc Alff2013-02-283-8/+8
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this fix, the command SHOW ENGINE PERFORMANCE_SCHEMA STATUS could report wrong amount of memory allocated, when the amount of memory used exceeds 4GB. The problem is that size computations are not done using size_t, so that overflows do occur, truncating the results. This fix compute memory sizes properly with size_t. Tested manually. No test script provided, as the script would need to allocate too much memory for the test.
* | (no commit message)unknown2013-02-280-0/+0
| |
* | (no commit message)unknown2013-02-280-0/+0
|\ \ | |/
| * (no commit message)unknown2013-02-280-0/+0
| |\
| | * (no commit message)unknown2012-09-140-0/+0
| | |
* | | Manual up-merge (16311231 backport)Gleb Shchepa2013-02-281-4/+1
|\ \ \ | |/ /
| * | Bug #16311231: MISSING DATA ON SUBQUERY WITH WHERE + XORGleb Shchepa2013-02-271-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IN IN-CLAUSE USING MYISAM OR MEMORY ENGINE Backport from 5.6. Original message: The coincidences caused a data loss: * The query has IN subqueries nested twice, * the WHERE clause of the inner subquery refers to the outer field, and the whole WHERE clause returns FALSE, * the inner subquery has a LEFT JOIN that joins a single row with a row of NULLs; one of that NULL columns represents the select list of the subquery. Normally, that inner subquery should return empty record set. However, in our case: * the Item_is_not_null_test item goes constant, since its underlying field is NULL (because of LEFT JOIN ... ON FALSE of const table row with a row of nulls); * we evaluate Item_is_not_null_test::val_int() as a part of fake HAVING expression of the transformed subquery; * as far as the underlying field is NULL, we optimize out the whole fake HAVING expression as FALSE as well as a whole subquery with a zero result: Impossible HAVING noticed after reading const tables"; * thus, the optimizer ignores the presence of the WHERE clause (the WHERE expression is FALSE in our case, so the subquery should return empty set); * however, during the evaluation of the Item_is_not_null_test::val_int() in the optimizer, it marked its "owner" with the "was_null" flag -- that forced the subquery to return UNKNOWN instead of empty set. That caused a wrong result. The problem is a regression of the small cleanup in the fix for the bug11827369 (the Item_is_not_null_test part) that conflicts with optimizations in the fix for the bug11752543. Before that regression the Item_is_not_null_test items never were constants. The fix is the rollback of Item_is_not_null_test parts of the bug11827369 fix.
* | | Bug #16305265 HANG IN RENAME TABLEunknown2013-02-272-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a deadlock that will also be fixed in the server by Bug #11844915 - HANG IN THDVAR MUTEX ACQUISITION. So this is a simple alternate method of fixing the same problem, but from within InnoDB. The simple change is to make rename table start a transaction before locking dict_sys->mutex since thd_supports_xa() can call THDVAR which can lock a mutex, LOCK_global_system_variables, that is used in the server by many other activities. At least one of those, sys_var::update(), can call back into InnoDB and try to lock dict_sys->mutex while holding LOCK_global_system_variables. The other bug fix for 11844915 eliminates the use of LOCK_global_system_variables for calls to THDVAR. Approved by marko in http://rb.no.oracle.com/rb/r/2000/
* | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2013-02-271-5/+6
|\ \ \ | |/ /