summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge from mysql-5.5.8-releaseJonathan Perkin2010-12-16942-43806/+26393
|\
| * Fix for bug #58669: read_only not enforced on 5.5.xRamil Kalimullin2010-12-036-3/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: "read-only" option ignored if it's enabled in the command line (or in the config file). Fix: sync opt_readonly (which is used for checks) with read_only (global var) when all server options are handled. mysql-test/r/bug58669.result: Fix for bug #58669: read_only not enforced on 5.5.x - test result. mysql-test/t/bug58669-master.opt: Fix for bug #58669: read_only not enforced on 5.5.x - test case. mysql-test/t/bug58669.test: Fix for bug #58669: read_only not enforced on 5.5.x - test case. sql/mysqld.cc: Fix for bug #58669: read_only not enforced on 5.5.x - sync opt_readonly boolean with read_only boolean in the get_options(). sql/mysqld.h: Fix for bug #58669: read_only not enforced on 5.5.x - sync opt_readonly boolean with read_only boolean in the get_options(). sql/sys_vars.cc: Fix for bug #58669: read_only not enforced on 5.5.x - sync opt_readonly boolean with read_only boolean in the get_options().
| * Bug #58414 mysql_upgrade fails on dump upgrade between 5.1.53 -> 5.5.8Jon Olav Hauglid2010-11-303-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that mysql_upgrade failed because DROP DATABASE refused to drop the 'performance_schema' database when the mysql.proc table definition was made temporarily invalid by dump import. This patch fixes the problem by adding the error resulting from opening a damaged mysq.proc table (ER_CANNOT_LOAD_FROM_TABLE), to the list of errors DROP DATABASE will ignore when trying to lock stored procedures and functions before deletion. This problem was a regression introduced by the patch for Bug#57663. Test case added to sp-destruct.test.
| * Cherrypicked http://lists.mysql.com/commits/124935Vladislav Vaintroub2010-11-261-4/+4
| | | | | | | | MSI: Only call custom action if REMOVE=ALL is specified, this avoids accidential removing services if feature states are modified (reported by Iggy)
| * Null-merge from mysql-5.5.7-rc-release.Alexander Nozdrin2010-11-250-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Null-merging revision 'revid: joerg@mysql.com-20101102213229-lyd8tl5gr40dotck' (Bug_57916: Fix the naming of the proxy_priv table) from mysql-5.5.7-rc-release. The patch is already in mysq-5.5.8-release (revid: georgi.kodinov@oracle.com-20101102154526-coc3muh4mlw91ti8)
| | * Bug #57916: Fix the naming of the proxy_priv tableJoerg Bruehe2010-11-0224-95/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fixed the name of the table to proxies_priv 2. Fixed the column names to be of the form Capitalized_lowercase instead of Capitalized_Capitalized 3. Added Timestamp and Grantor columns 4. Added tests to plugin_auth to check the table structure 5. Updated the existing tests Fix done by Georgi Kodinov, now transferred to the 5.5.7 release build clone.
| * | Null-merge from mysql-5.5.7-rc-release.Alexander Nozdrin2010-11-250-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Null-merging revision 'revid: kevin.lewis@oracle.com-20101102151655-b9oe4ii46szw7vx1' (Bug_57904 - Only one INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS was displayed per table from Innodb) from mysql-5.5.7-rc-release. The patch is already in mysql-5.5.8-release (revid: kevin.lewis@oracle.com-20101102150314-a3jx98sg7wm3emge).
| | * Bug#57904 - Only one INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS was displayedunknown2010-11-023-1/+69
| | | | | | | | | | | | per table from Innodb
| * | Auto-merge from mysql-5.5.7-rc-release.Alexander Nozdrin2010-11-250-0/+0
| |\ \ | | |/
| | * merge of 57689 revno: 3101 from mysql-5.5-bugteamMySQL Build Team2010-10-271-2/+37
| | |
| * | Auto-merge from mysql-5.5.7-rc-release.Alexander Nozdrin2010-11-253-1/+18
| |\ \ | | |/
| | * Bug#57512 str_to_date crash...Oystein Grovlen2010-10-203-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | str_to_date function should only try to generate a warning for invalid input strings, not when input value is NULL. In latter case, val_str() of input argument will return a nil pointer. Trying to generate a warning using this pointer lead to a segmentation fault. Solution: Only generate warning when pointer to input string is non-nil. mysql-test/r/func_time.result: Added test case for Bug#57512 mysql-test/t/func_time.test: Added test case for Bug#57512 sql/item_timefunc.cc: Skip generating warning when pointer to input string is nil since this implies that input argument was NULL.
| * | Fix the .deb package prefix.Jonathan Perkin2010-11-251-2/+2
| | |
| * | Support alternate license file.Jonathan Perkin2010-11-241-1/+6
| | |
| * | - Fix changelog (remove duplicated entry)Alexander Nozdrin2010-11-242-4/+1
| | | | | | | | | | | | - Mark main.gis experimental
| * | Bug#45445: cannot execute procedures with thread_stack set to 128k.Alexander Nozdrin2010-11-243-16/+4
| | | | | | | | | | | | Reverting the patch.
| * | Bug#55980 Character sets: supplementary character _bin ordering is wrongAlexander Nozdrin2010-11-243-15/+4
| | | | | | | | | | | | | | | | | | | | | | | | Post-fix: Reverting the "utf16_bin did not sort supplementary characters between U+D700 and U+E000" part. We'll use code-point order. Committing on behalf of Alexander Barkov.
| * | Merge from mysql-5.1-security.Alexander Nozdrin2010-11-242-294/+247
| |\ \
| | * \ Merge from mysql-5.0-security.Alexander Nozdrin2010-11-241-294/+246
| | |\ \
| | | * | A follow-up for Bug#58339 (Replace Server GPL README file).Alexander Nozdrin2010-11-241-294/+246
| | | | | | | | | | | | | | | | | | | | Fix formatting issues in README file.
| | * | | Empty merge from mysql-5.0-security.Alexander Nozdrin2010-11-240-0/+0
| | |\ \ \ | | | |/ /
| | | * | Merge from mysql-5.0-bugteam.Alexander Nozdrin2010-11-2414-25/+19
| | | |\ \
| | | * \ \ Auto-merge with mysql-5.0-bugteam.Ramil Kalimullin2010-11-232-154/+2302
| | | |\ \ \
| | * | \ \ \ Merge from mysql-5.1-bugteam.Alexander Nozdrin2010-11-2413-25/+19
| | |\ \ \ \ \
| | * | | | | | binlog.binlog_row_failure_mixing_engines test disabled.Ramil Kalimullin2010-11-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See bug #58416.
| | * | | | | | Auto-merge with mysql-5.1-bugteam.Ramil Kalimullin2010-11-2313-1321/+2496
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ empty upmerge after backport of bug 55568Gleb Shchepa2010-11-230-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | 5.0-security --> 5.1-security
| | | * | | | | | backport: Bug #55568 from 5.1-security to 5.0-securityGleb Shchepa2010-11-235-8/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > revision-id: alexey.kopytov@sun.com-20100824103548-ikm79qlfrvggyj9h > parent: sunny.bains@oracle.com-20100816001222-xqc447tr6jwh8c53 > committer: Alexey Kopytov <Alexey.Kopytov@Sun.com> > branch nick: 5.1-security > timestamp: Tue 2010-08-24 14:35:48 +0400 > message: > Bug #55568: user variable assignments crash server when used > within query > > The server could crash after materializing a derived table > which requires a temporary table for grouping. > > When destroying the temporary table used to execute a query for > a derived table, JOIN::destroy() did not clean up Item_fields > pointing to fields in the temporary table. This led to > dereferencing a dangling pointer when printing out the items > tree later in the outer SELECT. > > The solution is an addendum to the patch for bug37362: in > addition to cleaning up items in tmp_all_fields3, do the same > for items in tmp_all_fields1, since now we have an example > where this is necessary. sql/field.cc: Make sure field->table_name is not set to NULL in Field::make_field() to avoid assertion failure in Item_field::make_field() after cleaning up items (the assertion fired in udf.test when running the test suite with the patch applied). sql/sql_select.cc: In addition to cleaning up items in tmp_all_fields3, do the same for items in tmp_all_fields1. Introduce a new helper function to avoid code duplication. sql/sql_select.h: Introduce a new helper function to avoid code duplication in JOIN::destroy().
| * | | | | | | | Null-merge from mysql-5.1-security (changes already here).Alexander Nozdrin2010-11-240-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Manual-merge from mysql-5.1-bugteam.Ramil Kalimullin2010-11-2253-1165/+2271
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Null-merge from mysql-5.1-security (changes already here).Alexander Nozdrin2010-11-240-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Auto-merge from mysql-5.1-bugteam.Ramil Kalimullin2010-11-18172-42247/+771
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | Mark a couple of tests experimental.Alexander Nozdrin2010-11-241-0/+2
| | | | | | | | | | |
| * | | | | | | | | | Merge from mysql-5.5-bugteam.Alexander Nozdrin2010-11-248-13/+13
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge from mysql-5.1-bugteam.Alexander Nozdrin2010-11-248-17/+13
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge from mysql-5.0-bugteam.Alexander Nozdrin2010-11-2413-25/+19
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | / / | | | | | |_|_|_|_|/ / | | | | |/| | | | | |
| | | | * | | | | | | A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- ↵Alexander Nozdrin2010-11-2414-25/+19
| | | | | |_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove all EXCEPTIONS-CLIENT from all the places.
| * | | | | | | | | upmerge 58424Bjorn Munch2010-11-241-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bug #58424 mtr ignores failing mysqltest in the presence of expect file for ↵Bjorn Munch2010-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysqld If mysqltest dies, mtr waits to see if mysqld dies too within 100ms But in that case, it should not care about expected crash Fix: jump past the code that checks the expect file
| * | | | | | | | | | EXCEPTIONS-CLIENT was removed, update the RPM spec file.Jonathan Perkin2010-11-231-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While here, support supplying a '-j' flag to make(1) from the environment.
| * | | | | | | | | | Bug #58415 mtr cannot find libmysqld.dll in new 5.5 packagesBjorn Munch2010-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Done as suggested Also tested from src build directory
| * | | | | | | | | | Auto-merge with mysql-5.5-bugteam.Ramil Kalimullin2010-11-2352-5075/+2445
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | 5.1-bugteam->5.5-bugteam mergeSergey Glukhov2010-11-234-0/+96
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Bug#56862 Execution of a query that uses index merge returns a wrong resultSergey Glukhov2010-11-236-0/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of low memory sort buffer QUICK_INDEX_MERGE_SELECT creates temporary file where is stores row ids which meet QUICK_SELECT ranges except of clustered pk range, clustered range is processed separately. In init_read_record we check if temporary file is used and choose appropriate record access method. It does not take into account that temporary file contains partial result in case of QUICK_INDEX_MERGE_SELECT with clustered pk range. The fix is always to use rr_quick if QUICK_INDEX_MERGE_SELECT with clustered pk range is used. mysql-test/suite/innodb/r/innodb_mysql.result: test case mysql-test/suite/innodb/t/innodb_mysql.test: test case mysql-test/suite/innodb_plugin/r/innodb_mysql.result: test case mysql-test/suite/innodb_plugin/t/innodb_mysql.test: test case sql/opt_range.h: added new method sql/records.cc: The fix is always to use rr_quick if QUICK_INDEX_MERGE_SELECT with clustered pk range is used.
| | * | | | | | | | | Assorted fixes for test failures.Davi Arnaut2010-11-223-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/sys_vars/t/shared_memory_base_name_basic.test: The server shared memory name is located in the server's temporary directory, not in the mysqltest one. sql/sql_show.cc: */ ends a comment, add space to avoid problems.
| | * | | | | | | | | Merge from mysql-5.1-bugteam.Alexander Nozdrin2010-11-222-2329/+2302
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge from mysql-5.0-bugteam.Alexander Nozdrin2010-11-222-1313/+2302
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | | * | | | | | | Patch for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file).Alexander Nozdrin2010-11-221-119/+0
| | | | | | | | | | |
| | | | * | | | | | | Patch for Bug#58339 (Replace Server GPL README file).Alexander Nozdrin2010-11-221-35/+2302
| | | | | | | | | | |
| | * | | | | | | | | mergeMySQL Build Team2010-11-224-126/+1
| | |\ \ \ \ \ \ \ \ \