summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 5.1 -> 5.5 mergeSergey Glukhov2011-03-284-1/+31
|\
| * Bug#11766087 59125: VALGRIND UNINITIALISED VALUE WARNING IN ULL2DEC, ↵Sergey Glukhov2011-03-283-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LONGLONG2DECIMAL Valgrind warning happens due to missing NULL value check in Item_func::val_decimal. The fix is to add this check. mysql-test/r/func_time.result: test case mysql-test/t/func_time.test: test case sql/item_func.cc: added check for NULL value
| * Bug#11765216 58154: UNINITIALIZED VARIABLE FORMAT IN STR_TO_DATE FUNCTIONSergey Glukhov2011-03-283-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Valgrind warning happens due to uninitialized cached_format_type field which is used later in Item_func_str_to_date::val_str method. The fix is to init cached_format_type field. mysql-test/r/func_time.result: test case mysql-test/t/func_time.test: test case sql/item_timefunc.cc: init cached_format_type field
* | merge mysql-5.1->mysql-5.5Georgi Kodinov2011-03-288-52/+94
|\ \ | |/
| * Added support for VS10.Georgi Kodinov2011-03-283-1/+41
| | | | | | | | | | Fixed RelWithDebugInfo bzr ignores.
| * Fixed a test failure becase of a new warning caused by the fix for Georgi Kodinov2011-03-281-0/+2
| | | | | | | | | | Bug #11766769
| * Fixed a test failure in embedded because of the fix for BUG#11766769Georgi Kodinov2011-03-284-48/+51
| |
* | 5.1->5.5 mergeSergey Glukhov2011-03-280-0/+0
|\ \ | |/
| * automergeSergey Glukhov2011-03-2823-438/+350
| |\
* | \ automergeSergey Glukhov2011-03-280-0/+0
|\ \ \
| * \ \ Null mergeMagne Mahre2011-03-280-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | Bug#11900714 REMOVE LGPL LICENSED FILES IN MYSQL 5.1Magne Mahre2011-03-2823-438/+350
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LGPL license is used in some legacy code, and to adhere to current licensing polity, we remove those files that are no longer used, and reorganize the remaining LGPL code so it will be GPL licensed from now on. Note: This patch only removed LGPL licensed files in MySQL 5.1, and is the second of a set of patches to remove LGPL from all trees. (See Bug# 11840513 for details)
* | | | 5.1 -> 5.5 mergeSergey Glukhov2011-03-285-3/+50
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Bug#11764994 57900: CREATE TABLE .. SELECT ASSERTS SCALE >= 0 && PRECISION ↵Sergey Glukhov2011-03-283-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > 0 && SCALE <= PR Assert fails due to overflow which happens in Item_func_int_val::fix_num_length_and_dec() as geometry functions have max_length value equal to max_field_size(4294967295U). The fix is to skip max_length calculation for some boundary cases. mysql-test/r/func_math.result: test case mysql-test/t/func_math.test: test case sql/item_func.cc: skip max_length calculation if argument max_length is near max_field_size.
| * | Bug#11766424 59527: DECIMAL_BIN_SIZE: ASSERTION `SCALE >= 0 && PRECISION > ↵Sergey Glukhov2011-03-283-0/+30
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0 && SCALE <= PRE Assertion happens due to missing initialization of unsigned_flag for Item_func_set_user_var object. It leads to incorrect calculation of decimal field size. The fix is to add initialization of unsigned_flag. mysql-test/r/variables.result: test case mysql-test/t/variables.test: test case sql/item_func.cc: add initialization of unsigned_flag.
* | 5.1->5.5 mergeSergey Glukhov2011-03-283-2/+14
|\ \ | |/
| * Bug#11766112 59151:UNINITIALIZED VALUES IN EXTRACT_DATE_TIME WITH ↵Sergey Glukhov2011-03-283-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | STR_TO_DATE(SPACE(..) ... Valgrind warining happens due to missing 'end of the string' check. The fix is to check if we reached the end of the string. mysql-test/r/func_time.result: test case mysql-test/t/func_time.test: test case sql/item_timefunc.cc: check if we reached the end of the string after leading spaces skipping.
* | Fixing test case that is sporadically failing.Alfranio Correia2011-03-251-0/+1
| |
* | MergeMagnus Blåudd2011-03-2511-41/+413
|\ \
| * \ MergeMagnus Blåudd2011-03-2511-41/+413
| |\ \
| | * | Bug#60111 storage type for table not saved in .frmMagnus Blåudd2011-03-255-24/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (aka BUG#11766883) - fix review comments - Rewrite last usage of handler::get_tablespace_name to use table->s->tablespace directly - Remove(revert) the addition of default implementation for handler::get_tablespace_name - Add comments describing the new TABLE_SHARE members default_storage_media and tablespace - Fix usage of incorrect mask for column_format bits, i.e COLUMN_FORMAT_MASK
| | * | Bug#60111 storage type for table not saved in .frmMagnus Blåudd2011-03-0413-39/+421
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add new "format section" in extra data segment with additional table and column properties. This was originally introduced in 5.1.20 based MySQL Cluster - Remove hardcoded STORAGE DISK for table and instead output the real storage format used. Keep both TABLESPACE and STORAGE inside same version guard. - Implement default version of handler::get_tablespace_name() since tablespace is now available in share and it's unnecessary for each handler to implement. (the function could actually be removed totally now). - Add test for combinations of TABLESPACE and STORAGE with CREATE TABLE and ALTER TABLE - Add test to show that 5.5 now can read a .frm file created by MySQL Cluster 7.0.22. Although it does not yet show the column level attributes, they are read.
* | | | Merged BUG#11766427, BUG#59539 from 5.1 to 5.5.Sven Sandberg2011-03-253-3/+43
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| No conflicts.
| * | BUG#11766427, BUG#59539: Filter by server id in mysqlbinlog failsSven Sandberg2011-03-253-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: mysqlbinlog --server-id may filter out Format_description_log_events. If mysqlbinlog does not process the Format_description_log_event, then mysqlbinlog cannot read the rest of the binary log correctly. This can have the effect that mysqlbinlog crashes, generates an error, or generates output that causes mysqld to crash, generate an error, or corrupt data. Fix: Never filter out Format_description_log_events. Also, never filter out Rotate_log_events. client/mysqlbinlog.cc: Process Format_description_log_events even when the server_id does not match the number given by --server-id. mysql-test/t/mysqlbinlog.test: Add test case.
* | | mergeGeorgi Kodinov2011-03-250-0/+0
|\ \ \ | |/ /
| * | mergeGeorgi Kodinov2011-03-255-14/+69
| |\ \
* | \ \ mergeGeorgi Kodinov2011-03-255-14/+69
|\ \ \ \
| * \ \ \ BUG#11766865: Automerged mysql-5.1 into mysql-5.5.Luis Soares2011-03-255-14/+69
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Automerging bzr bundle attached to bug report into latest mysql-5.1.Luis Soares2011-03-245-14/+69
| | |\ \ \
| | | * | | BUG#11766865: 60091: RBR + NO PK + UPDATE NULL VALUE --> SLAVE BREAK WITH ↵Luis Soares2011-03-245-14/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ERROR HA_ERR_END_OF_ The slave was not able to find the correct row in the innodb table, because the row fetched from the innodb table would not match the before image. This happened because the (don't care) bytes in the NULLed fields would change once the row was stored in the storage engine (from zero to the default value). This would make bulk memory comparison (using memcmp) to fail. We fix this by taking a preventing measure and avoiding memcmp for tables that contain nullable fields. Therefore, we protect the slave search routine from engines that return arbitrary values for don't care bytes (in the nulled fields). Instead, the slave thread will only check null_bits and those fields that are not set to NULL when comparing the before image against the storage engine row. mysql-test/extra/rpl_tests/rpl_record_compare.test: Added test case to the include file so that this is tested with more than one engine. mysql-test/suite/rpl/r/rpl_row_rec_comp_innodb.result: Result update. mysql-test/suite/rpl/r/rpl_row_rec_comp_myisam.result: Result update. mysql-test/suite/rpl/t/rpl_row_rec_comp_myisam.test: Moved the include file last, so that the result from BUG#11766865 is not intermixed with the result for BUG#11760454. sql/log_event.cc: Skips memory comparison if the table has nullable columns and compares only non-nulled fields in the field comparison loop.
* | | | | | Merged bug #11766769 to 5.5. Georgi Kodinov2011-03-2511-4/+122
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | Added back the specific warning number.
| * | | | Bug #11766769: 59959: SMALL VALUES OF --MAX-ALLOWED-PACKET Georgi Kodinov2011-03-258-4/+102
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ARE NOT BEING HONORED max_allowed_packet works in conjunction with net_buffer_length. max_allowed_packet is an upper bound of net_buffer_length. So it doesn't make sense to set the upper limit lower than the value. Added a warning (using ER_UNKNOWN_ERRROR and a specific message) when this is done (in the log at startup and when setting either max_allowed_packet or the net_buffer_length variables) Added a test case. Fixed several tests that broke the above rule.
* | | | BUG#11765446 (BUG#58416)Luis Soares2011-03-241-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Removing the test case from mysql-5.5 list of disabled test cases for the binlog suite. Actually, the test does not exist in mysql-5.5, thus this is just a clean up.
| * | | | BUG#11765446 (BUG#58416)Luis Soares2011-03-241-1/+0
| |/ / / | | | | | | | | | | | | | | | | Original patch did not remove the test case from the list of disabled test cases. Removing it now!
* | | | Bug #11766306: 59393: have_innodb=yes when mysqld started with --skip-innodbGeorgi Kodinov2011-03-233-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | Initialized correctly the have_innodb variable so that when the plugin is not initialized it stays "disabled" instead of "yes". Test suite added.
* | | | null upmergeBjorn Munch2011-03-230-0/+0
|\ \ \ \ | |/ / /
| * | | merge from 5.1-mtrBjorn Munch2011-03-237-3/+42
| |\ \ \
* | \ \ \ merge from 5.5-mtrBjorn Munch2011-03-237-3/+39
|\ \ \ \ \
| * \ \ \ \ null upmergeBjorn Munch2011-03-220-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | merge from 5.1 mainBjorn Munch2011-03-2228-2277/+291
| | |\ \ \ \
| * | \ \ \ \ merge from 5.5 mainBjorn Munch2011-03-22122-2713/+1437
| |\ \ \ \ \ \
| * \ \ \ \ \ \ upmerge 11885854Bjorn Munch2011-03-181-3/+5
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Bug #11885854 MYSQLTEST: PS-PROTOCOL IMPLIED BY CURSOR-PROTOCOL LOST AFTER ↵Bjorn Munch2011-03-181-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ENABLE_PS_PROTOCOL The condition cursor-protocol => ps-protocol was done at "current setting" level" Moved it to "set by command line" level
| * | | | | | | upmerge 11762804Bjorn Munch2011-03-156-0/+34
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Bug #11762804 55442: MYSQLD DEBUG CRASHES WHILE RUNNING ↵Bjorn Munch2011-03-156-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MYISAM_CRASH_BEFORE_FLUSH_KEYS.TEST This will cause affected tests to skip if CrashReporter would popup Found 5 tests that needed modification
* | | | | | | | Null mergeMagne Mahre2011-03-220-0/+0
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | |
| * | | | | | Null merge (from mysql-5.0)Magne Mahre2011-03-220-0/+0
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Post-push fix for Bug 11896296Magne Mahre2011-03-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Didn't build on Solaris.
* | | | | | | Null mergeMagne Mahre2011-03-220-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Null mergeMagne Mahre2011-03-220-0/+0
| |\ \ \ \ \ \ | | |/ / / / /