summaryrefslogtreecommitdiff
path: root/mysql-test/r
Commit message (Collapse)AuthorAgeFilesLines
* A post-fix for MDEV-5009 don't look inside /*!50700 ... */ commentsAlexander Barkov2013-12-191-0/+6
| | | | | | | | | | | Fixing "/*100000 ...*/" comments (i.e. MySQL style with 6-digits), which were unintentionally broken in the MDEV-5009 patch. modified: mysql-test/r/comments.result mysql-test/t/comments.test sql/sql_lex.cc
* MDEV-5009 don't look inside /*!50700 ... */ commentsAlexander Barkov2013-12-181-0/+37
|
* Merge 5.5->10.0-baseAlexander Barkov2013-12-1721-0/+646
|\
| * MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) ↵Alexander Barkov2013-12-1721-0/+646
| | | | | | | | | | | | | | WITH ROLLUP Fixed a wrong assertion.
* | MDEV-5445 Server crashes in Item_func_like::fix_fields on LIKE ExtractValue(..)Alexander Barkov2013-12-171-0/+12
| | | | | | | | | | | | | | | | | | | | backporting from the main 10.0 modified: mysql-test/r/func_like.result mysql-test/t/func_like.test sql/item_cmpfunc.cc
* | 5.5 mergeSergei Golubchik2013-12-156-2/+116
|\ \ | |/
| * 5.3 mergeSergei Golubchik2013-12-134-0/+59
| |\
| | * Fixed bug mdev-5410.Igor Babaev2013-12-121-0/+23
| | | | | | | | | | | | | | | The fix for bug #27937 was incomplete: it did not handle correctly the queries containing UNION with global ORDER BY in subselects.
| | * MergeIgor Babaev2013-12-051-0/+15
| | |\
| | | * Fixed bug mdev-5382Igor Babaev2013-12-051-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When marking used columns the function find_field_in_table_ref() erroneously called the walk method for the real item behind a view/derived table field with the second parameter set to TRUE. This erroneous code was introduced in 2006.
| | * | MDEV-5353: server crash on subselect if WHERE applied to some result fieldunknown2013-12-041-0/+14
| | |/ | | | | | | | | | Correct processing of view/derived with no tables added.
| | * 5.2 mergeSergei Golubchik2013-12-021-0/+7
| | |\
| | | * 5.1 mergeSergei Golubchik2013-12-011-0/+7
| | | |\
| | | | * MDEV-5266 MySQL:57657 - Temporary MERGE table with temporary underlying is ↵Sergei Golubchik2013-11-291-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | broken by ALTER Fix ha_myisammrg::update_create_info() to do what ha_myisammrg::append_create_info() does - take sub-table names from TABLE_LIST, not reverse engineer tablefile names. Backport praveenkumar.hulakund@oracle.com-20120127081643-u7dxy23i8yyqarm7 from mysql-5.6
| * | | | Merge 5.3->5.5Alexander Barkov2013-12-021-2/+29
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | pending merges: Alexander Barkov 2013-12-02 MDEV-4857 Wrong result of HOUR('1 00:00:00')
| | * | | MDEV-4857 Wrong result of HOUR('1 00:00:00')Alexander Barkov2013-12-021-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: mysql-test/r/func_time.result mysql-test/t/func_time.test sql-common/my_time.c sql/item_func.h sql/item_timefunc.cc sql/mysql_priv.h sql/time.cc
| * | | | Merge 5.3 -> 5.5Alexander Barkov2013-12-021-0/+28
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | pending merges: Sergey Petrunya 2013-11-27 MDEV-5344: LEFT OUTER JOIN table data is lost...
| | * | | MDEV-5344: LEFT OUTER JOIN table data is lost in ON DUPLICATE KEY UPDATE sectionSergey Petrunya2013-11-271-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | - For INSERT ... SELECT ... ON DUPLICATE KEY UPDATE, table elimination should check which tables are referenced in the ON DUPLICATE KEY UPDATE clause.
* | | | | Fixed bug mdev-5415.Igor Babaev2013-12-142-0/+16
| | | | | | | | | | | | | | | | | | | | Do not calculate selectivity of conditions for the tables of the information schema.
* | | | | Fixing mysql_tzinfo_to_sql_symlink.result that wasAlexander Barkov2013-11-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inintentionally broken during merge 5.5->10.0-base modified: mysql-test/r/mysql_tzinfo_to_sql_symlink.result
* | | | | Fixed bug mdev-5204.Igor Babaev2013-11-272-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always use the value of table::file->stats.records when checking whether a table with HA_STATS_RECORDS_IS_EXACT flag contains not more than 1 record.
* | | | | Added the test case for bug mdev-5200.Igor Babaev2013-11-262-0/+58
| | | | | | | | | | | | | | | | | | | | The bug was fixed by the patch applied to the 5.3 tree in the revision 3727.
* | | | | 5.5 mergeSergei Golubchik2013-11-2328-116/+375
|\ \ \ \ \ | |/ / / /
| * | | | Merge 5.3->5.5Igor Babaev2013-11-2114-57/+36
| |\ \ \ \ | | |/ / /
| | * | | MergeIgor Babaev2013-11-219-52/+31
| | |\ \ \
| | | * | | Another attempt to fix bug mdev-5103.Igor Babaev2013-11-219-52/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The earlier pushed fix for the bug was incomplete. It did not remove the main cause of the problem: the function remove_eq_conds() removed always true multiple equalities from any conjunct, but did not adjust the list of them stored in Item_cond_and::cond_equal.current_level. Simplified the test case for the bug and moved it to another test file. The fix triggered changes in EXPLAIN EXTENDED for some queries.
| * | | | | MDEV-5059: Wrong result (missing row) wih semijoin, join_cache_level > 2, ↵Sergey Petrunya2013-11-212-12/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LEFT JOIN, ORDER BY - Added testcase
| * | | | | MergeSergey Petrunya2013-11-213-0/+85
| |\ \ \ \ \
| | * | | | | MDEV-5161: Wrong result (missing rows) with semijoin, LEFT JOIN, ORDER BY, ↵Sergey Petrunya2013-11-212-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | constant table - Don't pull out a table out of a semi-join if it is on the inner side of an outer join. - Make join->sort_by_table= get_sort_by_table(...) call after const table detection is done. That way, the value of join->sort_by_table will match the actual execution. Which will allow the code in setup_semijoin_dups_elimination() (search for "Make sure that possible sorting of rows from the head table is not to be employed." to see that "Using filesort" is going to be used together with Duplicate Elimination ( and change it to Using temporary + Using filesort)
| | * | | | | MDEV-5293: outer join, join buffering, and order by - invalid query planSergey Petrunya2013-11-181-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - make_join_readinfo() has the code that forces use of "Using temporary; Using filesort" when join buffering is in use. That code didn't handle all cases, in particular it didn't hande the case where ORDER BY originally has tables from multiple columns, but the optimizer eventually figures out that doing filesort() on one table will be sufficient. Adjusted the code to handle that case.
| * | | | | | Merge 5.3->5.5Alexander Barkov2013-11-212-4/+111
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | MDEV-4859 Wrong value and data type of "SELECT MAX(time_column) + 1 FROM t1"Alexander Barkov2013-11-212-4/+111
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Fixed.
| * | | | | mergeSergei Golubchik2013-11-204-50/+16
| |\ \ \ \ \
| | * \ \ \ \ mysql-5.5.34 mergeSergei Golubchik2013-11-194-50/+16
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | (some patches reverted, test case added)
| | | * | | | | Bug#16995954 : PLUGIN_AUTH TESTS FAIL ON SYSTEMS WITH NO HOSTNAME OTHERSneha Modi2013-08-212-25/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | THAN LOCALHOST This is a test bug and the explanation for the behaviour can be found on the bug page.Modifying the select to select user where user!=root for the line where failure is encountered on machines with no hostname other than the localhost.
| | | * | | | | Fix for bug#14188793 - "DEADLOCK CAUSED BY ALTER TABLE DOEN'T CLEARDmitry Lenev2013-08-203-31/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | STATUS OF ROLLBACKED TRANSACTION" and bug #17054007 - "TRANSACTION IS NOT FULLY ROLLED BACK IN CASE OF INNODB DEADLOCK". The problem in the first bug report was that although deadlock involving metadata locks was reported using the same error code and message as InnoDB deadlock it didn't rollback transaction like the latter. This caused confusion to users as in some cases after ER_LOCK_DEADLOCK transaction could have been restarted immediately and in some cases rollback was required. The problem in the second bug report was that although InnoDB deadlock caused transaction rollback in all storage engines it didn't cause release of metadata locks. So concurrent DDL on the tables used in transaction was blocked until implicit or explicit COMMIT or ROLLBACK was issued in the connection which got InnoDB deadlock. The former issue has stemmed from the fact that when support for detection and reporting metadata locks deadlocks was added we erroneously assumed that InnoDB doesn't rollback transaction on deadlock but only last statement (while this is what happens on InnoDB lock timeout actually) and so didn't implement rollback of transactions on MDL deadlocks. The latter issue was caused by the fact that rollback of transaction due to deadlock is carried out by setting THD::transaction_rollback_request flag at the point where deadlock is detected and performing rollback inside of trans_rollback_stmt() call when this flag is set. And trans_rollback_stmt() is not aware of MDL locks, so no MDL locks are released. This patch solves these two problems in the following way: - In case when MDL deadlock is detect transaction rollback is requested by setting THD::transaction_rollback_request flag. - Code performing rollback of transaction if THD::transaction_rollback_request is moved out from trans_rollback_stmt(). Now we handle rollback request on the same level as we call trans_rollback_stmt() and release statement/ transaction MDL locks.
| * | | | | | | MDEV-5069: Server crashes in SEL_ARG::increment_use_count with ↵Sergey Petrunya2013-11-191-0/+60
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | index_merge+index_merge_sort_union, FORCE INDEX - Don't call incr_refs() is the merged SEL_ARG* is NULL.
| * | | | | | 5.3 mergeSergei Golubchik2013-11-151-1/+14
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Fixed bug mdev-5288.Igor Babaev2013-11-141-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug was a consequence of the incorrect fix for bug mdev-5091.
| * | | | | | Merge 5.3->5.5Alexander Barkov2013-11-141-0/+15
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | MergeIgor Babaev2013-11-131-0/+15
| | |\ \ \ \ \
| | | * | | | | Fixed bug mdev-5091.Igor Babaev2013-11-131-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function SELECT_LEX::update_used_tables should process all ORDER BY lists in any subselect of a union.
* | | | | | | | MDEV-5308 Crash when running with slow_query_log=1Sergey Petrunya2013-11-211-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make log_slow_statement() always call delete_explain_query().
* | | | | | | | Merge 5.5->10.0-baseAlexander Barkov2013-11-211-0/+22
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge 5.3 -> 5.5Alexander Barkov2013-11-131-0/+22
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge 5.2 -> 5.3Alexander Barkov2013-11-131-0/+22
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | Merge 5.1 -> 5.2Alexander Barkov2013-11-131-0/+22
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | MDEV-5226 mysql_tzinfo_to_sql errors with tzdata 2013f and aboveAlexander Barkov2013-11-131-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow only one level of symlink recursion in mysql_tzdata_to_sql, to avoid infinite loops.
* | | | | | | | 5.5. mergeSergei Golubchik2013-11-137-4/+129
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 5.3 mergeSergei Golubchik2013-11-132-0/+23
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | / | | |_|_|_|_|/ | |/| | | | |