summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* merge from mysql-5.5Georgi Kodinov2011-05-111-1/+1
|\
| * Cloning of the 5.5.13 release from Mysql-5.5,MySQL Build Team2011-05-111-1/+1
| | | | | | | | | | increase the version number by two
* | Bug #11744875: 4082: integer lengths cause truncation with distinct concat Georgi Kodinov2011-05-1110-12/+94
|/ | | | | | | | | | | | | | | | | | | | | | | | | and innodb The 5.5 version of the patch. The server doesn't restrict the data that can be inserted into integer columns with explicitly specified length that's smaller than what the type can handle, e.g. 1234 can be inserted into an INT(2) column just fine. Thus, when calcualting the maximum width of expressions involving such restricted integer columns we need to use the implicit maximum width of the field instead of the explicitly speficied one. Fixed the server to use the implicit maximum in such cases and made sure the implicit maximum is addjusted the same way as the explicit one wrt signedness. Fixed several test case results (ctype_*.result, metadata.result and type_ranges.result) to reflect the extended column widths. Added a regression test case in distinct.test. Note : this is the behavior preserving fix that makes 5.5 behave as 5.1 and earlier. In the mysql trunk we'll add a insert time check for the explict maximum size.
* weave null merge mysql-5.1->mysql-5.5Georgi Kodinov2011-05-100-0/+0
|\
| * weave merge mysql-5.0->mysql-5.1Georgi Kodinov2011-05-100-0/+0
| |\
| | * Merge from mysql-5.0.93-releaseSunanda Menon2011-05-061-0/+1
| | |\
| * | \ Merge from mysql-5.1.57-releaseKaren Langford2011-05-0612-33/+329
| |\ \ \
| | * | | Bug#11867664: Fix server crashes on update with join on partitioned table.unknown2011-04-121-1/+9
| | | | |
* | | | | automerge 5.1->5.5Serge Kozlov2011-05-091-1/+1
| | | | |
* | | | | Patch for Bug#12362125 (SP INOUT HANDLING IS BROKEN FOR TEXT TYPE).Alexander Nozdrin2011-05-093-4/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempts to assign value to a table column from trigger by using NEW.column_name pseudo-variable might result in garbled data. That happened when: - the column had a BLOB-based type (e.g. TEXT) and - the value being assigned was retrieved from stored routine variable of the same type. The problem was that BLOB values were not copied correctly in this case. Instead of doing a copy of a real value, the value's representation in record buffer was copied. This representation is essentially a pointer to a buffer associated with the virtual table for routine variables where the real value is stored. Since this buffer got freed once trigger was left or could have changed its contents when new value was assigned to corresponding routine variable such a shallow copying resulted in garbled data in NEW.colum_name column. It worked in 5.1 due to a subtle bug in create_virtual_tmp_table(): - in 5.1 create_virtual_tmp_table() returned a table which had db_low_byte_first == false. - in 5.5 and up create_virtual_tmp_table() returns a table which has db_low_byte_first == true. Actually, db_low_byte_first == false only for ISAM storage engine, which was deprecated and removed in 5.0. Having db_low_byte_first == false led to getting false in the complex condition for the 2nd "if" in field_conv(), which in turn led to copy-blob-behavior as a fall-back strategy: - to->table->s->db_low_byte_first was true (correct value) - from->table->s->db_low_byte_first was false (incorrect value) In 5.5 and up that condition is true, which means blob-values are not copied.
* | | | | Patch for Bug#12374486 - SEVERE MEMORY LEAK IN PREPARED STATEMENTSAlexander Nozdrin2011-05-063-23/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | THAT CALL STORED PROCEDURES. The bug was introduced by WL#4435. The problem was that if a stored procedure generated a few result sets with different set of columns, a new memory would be allocated after every EXECUTE for every result set. The fix is to introduce a new memory root in scope of MYSQL_STMT, and to store result-set metadata in that memory root.
* | | | | Patch for Bug#11848763 / 60025Alexander Nozdrin2011-05-061-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (SUBSTRING inside a stored function works too slow). The user-visible problem was that the server started to consume memory if a stored-routine of some sort is executed subsequently. The memory was freed only after the corresponding connection was closed. Technically, the problem was that the memory needed for temporary string conversions was allocated on the connection ("persistent") memory root, instead of statement one. The root cause of this problem was the incorrect patch for Bug 55744. That patch wrongly fixed a crash in prepared-statement-mode introduced by another patch. The patch for Bug 55744 used wrong condition to check if prepared statement mode is active (or whether the connection-scoped or statement-scoped memory root should be used). The thing is that for prepared statements such conversions should be done in the connection memory root, so that that the transformations of item-tree were correctly remembered in the PREPARE-phase. The fix is to use proper condition to detect prepared-statement-mode and use proper memory root.
* | | | | Preliminary patch for Bug#11848763 / 60025Alexander Nozdrin2011-05-066-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (SUBSTRING inside a stored function works too slow). Background: - THD classes derives from Query_arena, thus inherits the 'state' attribute and related operations (is_stmt_prepare() & co). - Although these operations are available in THD, they must not be used. THD has its own attribute to point to the active Query_arena -- stmt_arena. - So, instead of using thd->is_stmt_prepare(), thd->stmt_arena->is_stmt_prepare() must be used. This was the root cause of Bug 60025. This patch enforces the proper way of calling those operations. is_stmt_prepare() & co are declared as private operations in THD (thus, they are hidden from being called on THD instance). The patch tries to minimize changes in 5.5.
* | | | | Add --with-debug=full support to BUILD/* scripts, this option has been lostMagnus Blåudd2011-05-061-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | between 5.1 and 5.5, it's purpose is to set the compiler flags in a way that does not optimize away the call stack(i.e don't use any -OX flags at all)
* | | | | Merge in patch for bug 12380149Magnus Blåudd2011-05-061-1/+1
| | | | |
* | | | | Merge from mysql-5.5.12-releaseunknown2011-05-0620-55/+330
|\ \ \ \ \
| * \ \ \ \ Auto-merge from mysql-5.5.Alexander Nozdrin2011-04-0811-6/+197
| |\ \ \ \ \
| * \ \ \ \ \ Empty merge from mysql-5.1-security.Alexander Nozdrin2011-04-080-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2011-04-0821-78/+91
| | |\ \ \ \ \
| * | \ \ \ \ \ Auto-merge from mysql-5.5.Alexander Nozdrin2011-04-0824-145/+231
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ fixed a number for a missing warningGeorgi Kodinov2011-04-071-0/+2
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | fixed a missing warningGeorgi Kodinov2011-04-071-0/+2
| | | | | | | | |
| * | | | | | | | merge mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2011-04-071-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2011-04-070-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | merge mysql-5.0->mysql-5.0-securityGeorgi Kodinov2011-04-0726-357/+226
| | | |\ \ \ \ \ \
| | * | \ \ \ \ \ \ merged mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-04-0787-612/+1222
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2011-03-211-0/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | mergeGeorgi Kodinov2011-03-211-0/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Bug #59815: Missing License information with enterprise GPL packagesGeorgi Kodinov2011-02-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on behalf of Kent: Include the README into the binary packages
| | | * | | | | | | | | merge 5.0->5.0-securityGeorgi Kodinov2011-03-214-2210/+22
| | | |\ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-03-216-2256/+52
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ merge 5.5->5.5-securityGeorgi Kodinov2011-04-07141-2231/+2953
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Bug#11829785 EXPLAIN EXTENDED CRASH WITH RIGHT OUTER JOIN, SUBQUERIESTor Didriksen2011-03-245-7/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a backport of Bug #46860 Crash/segfault using EXPLAIN EXTENDED on query using UNION in subquery. mysql-test/r/explain.result: Remove the extended Note, since explain returns error. New test case. mysql-test/r/func_gconcat.result: Remove the extended Note, since explain returns error. mysql-test/r/subselect3.result: Remove the extended Note, since explain returns error. mysql-test/t/explain.test: New test case. sql/sql_parse.cc: Skip the extended description if we have an error.
| * | | | | | | | | | | | | | merge mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2011-03-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ merge 5.1->5.1-securityGeorgi Kodinov2011-03-216-2256/+52
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | / / / / / / / / / / / | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | | merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-03-2154-2557/+630
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fixed the test cleanup code post-mergeGeorgi Kodinov2011-03-172-0/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed a post-merge embedded compilation errorGeorgi Kodinov2011-03-171-0/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | merge 5.1-security->5.5-securityGeorgi Kodinov2011-03-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | merge 5.1->5.1-securityGeorgi Kodinov2011-03-1787-29/+417
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ merged mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-03-17167-186/+1501
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ auto-mergeGeorgi Kodinov2011-03-153-0/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Bug #11765023: 57934: DOS POSSIBLE SINCE BINARY CASTING DOESN'T Georgi Kodinov2011-03-153-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ADHERE TO MAX_ALLOWED_PACKET Added a check for max_packet_length in CONVERT(, BINARY|CHAR). Added a test case.
| | * | | | | | | | | | | | | | | | automergeKristofer Pettersson2011-03-1171-642/+2051
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ automergeKristofer Pettersson2011-03-143-9/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | BUG#11766234: ASSERT (TABLE_REF->TABLE || TABLE_REF->VIEW) Jorgen Loland2011-03-143-9/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FAILS IN SET_FIELD_ITERATOR (Former 59299) When a PROCEDURE does a natural join, resolving of which columns are used in the join is done only once; consecutive CALLs to the procedure will reuse this information: CREATE PROCEDURE proc() SELECT * FROM t1 NATURAL JOIN v1; CALL proc(); <- natural join columns resolved here CALL proc(); <- reuse resolved NJ columns from first CALL The second CALL knows that it can reuse the resolved NJ columns because the first CALL sets st_select_lex::first_natural_join_processing=false. The problem in this bug was that the table the view v1 depends on changed between CREATE PROCEDURE and the first CALL: CREATE PROCEDURE... ALTER TABLE t2 CHANGE COLUMN a b CHAR; CALL proc(); <- error when resolving natural join columns CALL proc(); <- tries to reuse from first CALL => crash The fix for this bug is to set first_natural_join_processing= FALSE iff the natural join columns resolving was successful. mysql-test/r/sp.result: Add test for bug 11766234 mysql-test/t/sp.test: Add test for bug 11766234 sql/sql_base.cc: Set first_natural_join_processing= FALSE iff the natural join columns resolving was successful.
| * | | | | | | | | | | | | | | | | | | Certain fields in the protcol required a strict formatting. IfKristofer Pettersson2011-03-141-32/+144
| |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | off bound values were sent to the server this could under some circumstances lead to a crash on the Windows platform.
| * | | | | | | | | | | | | | | | | | Null merge 5.1 to 5.5.Kristofer Pettersson2011-03-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Certain fields in the protcol required a strict formatting. IfKristofer Pettersson2011-03-111-22/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | off bound values were sent to the server this could under some circumstances lead to a crash on the Windows platform.
| * | | | | | | | | | | | | | | | | | merge 5.1-security->5.5-securityGeorgi Kodinov2011-03-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
View Lorry Controller Status