summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge MariaDB 5.2->5.3unknown2012-11-2017-46/+223
|\
| * Merge MariaDB 5.1->5.2.unknown2012-11-207-28/+58
| |\
| | * MDEV-3861: assertions in TC_LOG_MMAP.unknown2012-11-202-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some problems in the TC_LOG_MMAP commit processing, which could lead to assertions in some cases. Problems are mostly reproducible in MariaDB 10.0 with asynchroneous commit checkpoints, but most of the problems were present in earlier versions also.
| | * potential crash in the feedback pluginSergei Golubchik2012-11-191-3/+6
| | |
| | * MDEV-3850 too early pthread_mutex_unlock in TC_LOG_MMAP::log_xidSergei Golubchik2012-11-171-4/+1
| | |
| | * followup fixes for MySQL Bug #13889741: HANDLE_FATAL_SIGNAL IN _DB_ENTER_ | ↵Sergei Golubchik2012-11-123-4/+27
| | | | | | | | | | | | HANDLE_FATAL_SIGNAL IN STRNLEN
| | * MDEV-3849 - 1 bytes stack overwrite in normalize_dirname().Vladislav Vaintroub2012-11-101-7/+7
| | | | | | | | | | | | | | | Take into account that length of strings passed down to this function can be up to FN_REFLEN+1 bytes. including terminating zero. The overwrite was caused by incomplete fix to MySQL Bug # 44834
| | * add a test case for MySQL Bug #13889741: HANDLE_FATAL_SIGNAL IN _DB_ENTER_ | ↵Sergei Golubchik2012-11-092-0/+6
| | | | | | | | | | | | HANDLE_FATAL_SIGNAL IN STRNLEN
| * | Fixed bug mdev-3845.Igor Babaev2012-11-0910-18/+165
| | | | | | | | | | | | | | | | | | If triggers are used for an insert/update/delete statement than the values of all virtual columns must be computed as any of them may be used by the triggers.
* | | MDEV-3801unknown2012-11-192-27/+26
| | | | | | | | | | | | Adjust unstable test case.
* | | MDEV-3801 Reproducible sub select join crash on 5.3.8 and 5.3.9unknown2012-11-193-1/+132
| | | | | | | | | | | | | | | | | | Properly drop all unused keys. Patch by Igor Babaev.
* | | Increase the version number to 5.3.10.unknown2012-11-101-1/+1
| | |
* | | adjusted test resultunknown2012-11-101-46/+184
| | |
* | | adjust openssl_1 test as in 5.2 (no idea why this didn't merge)unknown2012-11-091-3/+3
| | |
* | | MDEV-3810 fix.unknown2012-11-091-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | The problem is that memory alocated by copy_andor_structure() well be freed, but if level of SELECT_LEX it will be excluded (in case of merge derived tables and view) then sl->where/having will not be updated here but still can be accessed (so it will be access to freed memory). (patch by Sanja)
* | | merge from 5.2unknown2012-11-091-1/+0
|\ \ \ | |/ /
| * | Disable PBXT on Windows to match all other platforms.unknown2012-11-091-1/+0
| | |
* | | merge test case adjustments from 5.2unknown2012-11-095-144/+323
|\ \ \ | |/ /
| * | Removed the dependency on PBXT from tests information_schema_all_engines, ↵unknown2012-11-095-248/+444
| | | | | | | | | | | | | | | | | | and is_columns_is. Made information_schema_all_engines stable by adding "sorted_result".
* | | Merge from 5.2unknown2012-11-091-125/+0
|\ \ \ | |/ /
| * | Fix mis-merge.Vladislav Vaintroub2012-11-081-125/+0
| | |
* | | Merge MariaDB 5.1.66 -> 5.2 -> 5.3unknown2012-11-09139-1003/+7889
|\ \ \ | |/ /
| * | Merged and adjusted test cases from 5.1 after the merge with 5.1.unknown2012-11-083-55/+331
| |\ \ | | |/
| | * Updated test results after the mysql 5.1 merge.unknown2012-11-073-57/+334
| | |
| * | Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-08139-965/+7816
| |\ \ | | |/
| | * Merge MySQL 5.1.66 -> MariaDB 5.1.65unknown2012-11-0683-433/+2892
| | |\
| | | * Spec file change to work around cast ulonglong -> int.Joerg Bruehe2012-09-111-1/+6
| | | |
| | | * Bug#13734987 MEMORY LEAK WITH I_S/SHOW AND VIEWS WITH SUBQUERYTor Didriksen2012-09-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In fill_schema_table_by_open(): free item list before restoring active arena. sql/sql_show.cc: Replaced i_s_arena.free_items with DBUG_ASSERT(i_s_arena.free_list == NULL) (there's nothing to free in that list)
| | | * (no commit message)unknown2012-09-030-0/+0
| | | |
| | | * Bug #13453036 ERROR CODE 1118: ROW SIZE TOO LARGE - EVEN Annamalai Gurusami2012-08-317-11/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | THOUGH IT IS NOT. The following error message is misleading because it claims that the BLOB space is not counted. "ERROR 1118 (42000): Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. You have to change some columns to TEXT or BLOBs" When the ROW_FORMAT=compact or ROW_FORMAT=REDUNDANT is used, the BLOB prefix is stored inline along with the row. So the above error message is changed as follows depending on the row format used: For ROW_FORMAT=COMPRESSED or ROW_FORMAT=DYNAMIC, the error message is as follows: "ERROR 42000: Row size too large (> 8126). Changing some columns to TEXT or BLOB may help. In current row format, BLOB prefix of 0 bytes is stored inline." For ROW_FORMAT=COMPACT or ROW_FORMAT=REDUNDANT, the error message is as follows: "ERROR 42000: Row size too large (> 8126). Changing some columns to TEXT or BLOB or using ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED may help. In current row format, BLOB prefix of 768 bytes is stored inline." rb://1252 approved by Marko Makela
| | | * (no commit message)unknown2012-08-310-0/+0
| | | |
| | | * Bug#14554000 CRASH IN PAGE_REC_GET_NTH_CONST(NTH=0) DURING COMPRESSEDMarko Mäkelä2012-08-304-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PAGE SPLIT page_rec_get_nth_const(): Map nth==0 to the page infimum. btr_compress(adjust=TRUE): Add a debug assertion for nth>0. The cursor should never be positioned on the page infimum. btr_index_page_validate(): Add test instrumentation for checking the return values of page_rec_get_nth_const() during CHECK TABLE, and for checking that the page directory slot 0 always contains only one record, the predefined page infimum record. page_cur_delete_rec(), page_delete_rec_list_end(): Add debug assertions guarding against accessing the page slot 0. page_copy_rec_list_start(): Clarify a comment about ret_pos==0. rb:1248 approved by Jimmy Yang
| | | * Bug#14547952: DEBUG BUILD FAILS ASSERTION IN RECORDS_IN_RANGE()Marko Mäkelä2012-08-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ha_innodb::records_in_range(): Remove a debug assertion that prohibits an open range (full table). The patch by Jorgen Loland only removed the assertion from the built-in InnoDB, not from the InnoDB Plugin.
| | | * Bug#14547952: DEBUG BUILD FAILS ASSERTION IN RECORDS_IN_RANGE()Jorgen Loland2012-08-281-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ha_innobase::records_in_range(): Remove a debug assertion that prohibits an open range (full table). This assertion catches unnecessary calls to this method, but such calls are not harming correctness.
| | | * Fix regression from Bug#12845774 OPTIMISTIC INSERT/UPDATE USES WRONGMarko Mäkelä2012-08-212-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HEURISTICS FOR COMPRESSED PAGE SIZE The fix of Bug#12845774 was supposed to skip known-to-fail btr_cur_optimistic_insert() calls. There was only one such call, in btr_cur_pessimistic_update(). All other callers of btr_cur_pessimistic_insert() would release and reacquire the B-tree page latch before attempting the pessimistic insert. This would allow other threads to restructure the B-tree, allowing (and requiring) the insert to succeed as an optimistic (single-page) operation. Failure to attempt an optimistic insert before a pessimistic one would trigger an attempt to split an empty page. rb:1234 approved by Sunny Bains
| | | * Bug#13025132 - PARTITIONS USE TOO MUCH MEMORYMattias Jonsson2012-08-201-1/+1
| | | | | | | | | | | | | | | | pre-push fix, removed unused variable.
| | | * mergeMattias Jonsson2012-08-202-53/+92
| | | |\
| | | | * Bug#13025132 - PARTITIONS USE TOO MUCH MEMORYMattias Jonsson2012-08-172-35/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional patch to remove the part_id -> ref_buffer offset. The partitioning id and the associate record buffer can be found without having to calculate it. By initializing it for each used partition, and then reuse the key-buffer from the queue, it is not needed to have such map.
| | | | * Bug#13025132 - PARTITIONS USE TOO MUCH MEMORYMattias Jonsson2012-08-152-39/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The buffer for the current read row from each partition (m_ordered_rec_buffer) used for sorted reads was allocated on open and freed when the ha_partition handler was closed or destroyed. For tables with many partitions and big records this could take up too much valuable memory. Solution is to only allocate the memory when it is needed and free it when nolonger needed. I.e. allocate it in index_init and free it in index_end (and to handle failures also free it on reset, close etc.) Also only allocating needed memory, according to partitioning pruning. Manually tested that it does not use as much memory and releases it after queries.
| | | * | Backporting Bug 14100466 from 5.6.Alexander Barkov2012-08-172-5/+14
| | | | |
| | | * | Bug#12595091 POSSIBLY INVALID ASSERTION IN BTR_CUR_PESSIMISTIC_UPDATE()Marko Mäkelä2012-08-162-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Facebook got a case where the page compresses really well so that btr_cur_optimistic_update() returns DB_UNDERFLOW, but when a record gets updated, the compression rate radically changes so that btr_cur_insert_if_possible() can not insert in place despite reorganizing/recompressing the page, leading to the assertion failing. rb:1220 approved by Sunny Bains
| | | * | Bug#12845774 OPTIMISTIC INSERT/UPDATE USES WRONG HEURISTICS FORMarko Mäkelä2012-08-163-20/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | COMPRESSED PAGE SIZE This was submitted as MySQL Bug 61456 and a patch provided by Facebook. This patch follows the same idea, but instead of adding a parameter to btr_cur_pessimistic_insert(), we simply remove the btr_cur_optimistic_insert() call there and add it to the only caller that needs it. btr_cur_pessimistic_insert(): Do not try btr_cur_optimistic_insert(). btr_insert_on_non_leaf_level_func(): Invoke btr_cur_optimistic_insert() before invoking btr_cur_pessimistic_insert(). btr_cur_pessimistic_update(): Clarify in a comment why it is not necessary to invoke btr_cur_optimistic_insert(). btr_root_raise_and_insert(): Assert that the root page is not empty. This could happen if a pessimistic insert (involving a split or merge) is performed without first attempting an optimistic (intra-page) insert. rb:1219 approved by Sunny Bains
| | | * | Bug#13523839 ASSERTION FAILURES ON COMPRESSED INNODB TABLESMarko Mäkelä2012-08-163-13/+28
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | btr_cur_optimistic_insert(): Remove a bogus assertion. The insert may fail after reorganizing the page. btr_cur_optimistic_update(): Do not attempt to reorganize compressed pages, because compression may fail after reorganization. page_copy_rec_list_start(): Use page_rec_get_nth() to restore to the ret_pos, which may also be the page infimum. rb:1221
| | | * Bug#13596613:SHOW SLAVE STATUS GIVES WRONG OUTPUT WITHSujatha Sivakumar2012-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MASTER-MASTER AND USING SET USE Problem: ======= In a master-master set-up, a master can show a wrong 'SHOW SLAVE STATUS' output. Requirements: - master-master - log_slave_updates This is caused when using SET user-variables and then using it to perform writes. From then on the master that performed the insert will have a SHOW SLAVE STATUS that is wrong and it will never get updated until a write happens on the other master. On"Master A" the "exec_master_log_pos" is not getting updated. Analysis: ======== Slave receives a "User_var" event from the master and after applying the event, when "log_slave_updates" option is enabled the slave tries to write this applied event into its own binary log. At the time of writing this event the slave should use the "originating server-id". But in the above case the sever always logs the "user var events" by using its global server-id. Due to this in a "master-master" replication when the event comes back to the originating server the "User_var_event" doesn't get skipped. "User_var_events" are context based events and they always follow with a query event which marks their end of group. Due to the above mentioned problem with "User_var_event" logging the "User_var_event" never gets skipped where as its corresponding "query_event" gets skipped. Hence the "User_var" event always waits for the next "query event" and the "Exec_master_log_position" does not get updated properly. Fix: === `MYSQL_BIN_LOG::write' function is used to write events into binary log. Within this function a new object for "User_var_log_event" is created and this new object is used to write the "User_var" event in the binlog. "User var" event is inherited from "Log_event". This "Log_event" has different overloaded constructors. When a "THD" object is present "Log_event(thd,...)" constructor should be used to initialise the objects and in the absence of a valid "THD" object "Log_event()" minimal constructor should be used. In the above mentioned problem always default minimal constructor was used which is incorrect. This minimal constructor is replaced with "Log_event(thd,...)". sql/log_event.h: Replaced the default constructor with another constructor which takes "THD" object as an argument.
| | | * Bug #13115401: -SSL-KEY VALUE IS NOT VALIDATED AND IT ALLOWS INSECURE Venkata Sidagam2012-08-114-41/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONNECTIONS IF SPE Problem description: -ssl-key value is not validated, you can assign any bogus text to --ssl-key and it is not verified that it exists, and more importantly, it allows the client to connect to mysqld. Fix: Added proper validations checks for --ssl-key. Note: 1) Documentation changes require for 5.1, 5.5, 5.6 and trunk in the sections listed below and the details are : http://dev.mysql.com/doc/refman/5.6/en/ssl-options.html#option_general_ssl and REQUIRE SSL section of http://dev.mysql.com/doc/refman/5.6/en/grant.html 2) Client having with option '--ssl', should able to get ssl connection. This will be implemented as part of separate fix in 5.6 and trunk.
| | | * Bug #14409015 MEMORY LEAK WHEN REFERENCING OUTER FIELD IN HAVINGSergey Glukhov2012-08-093-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When resolving outer fields, Item_field::fix_outer_fields() creates new Item_refs for each execution of a prepared statement, so these must be allocated in the runtime memroot. The memroot switching before resolving JOIN::having causes these to be allocated in the statement root, leaking memory for each PS execution. sql/item_subselect.cc: addon, fix for 11829691, item could be created in runtime memroot, so we need to use real_item instead.
| | | * Merge from mysql-5.1 to working copy.Marko Mäkelä2012-08-092-8/+1
| | | |\
| | | | * Merge from mysql-5.1.65-releaseSunanda Menon2012-08-092-8/+1
| | | | |\
| | | * | | Bug#14399148 INNODB TABLES UNDER LOAD PRODUCE DUPLICATE COPIES OF ROWSMarko Mäkelä2012-08-094-73/+83
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IN QUERIES This bug was caused by an incorrect fix of Bug#13807811 BTR_PCUR_RESTORE_POSITION() CAN SKIP A RECORD There was nothing wrong with btr_pcur_restore_position(), but with the use of it in the table scan during index creation. rb:1206 approved by Jimmy Yang
| | | * | BUG#11757312: MYSQLBINLOG DOES NOT ACCEPT INPUT FROM STDINRohit Kalhans2012-08-081-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WHEN STDIN IS A PIPE Problem: Mysqlbinlog does not accept the input from STDIN when STDIN is a pipe. This prevents the users from passing the input file through a shell pipe. Background: The my_seek() function does not check if the file descriptor passed to it is regular (seekable) file. The check_header() function in mysqlbinlog calls the my_b_seek() unconditionally and it fails when the underlying file is a PIPE. Resolution: We resolve this problem by checking if the underlying file is a regular file by using my_fstat() before calling my_b_seek(). If the underlying file is not seekable we skip the call to my_b_seek() in check_header(). client/mysqlbinlog.cc: Added a check to avoid the my_b_seek() call if the underlying file is a PIPE.