summaryrefslogtreecommitdiff
path: root/mysql-test/include
Commit message (Expand)AuthorAgeFilesLines
* merge of mysql-5.5 into mysql-5.5-wl1054Georgi Kodinov2010-09-2010-35/+172
|\
| * Cherry-picking patch for Bug#55980.Alexander Nozdrin2010-08-311-0/+16
| * Auto-merge from mysql-5.5-merge.Alexander Nozdrin2010-08-251-0/+5
| |\
| | * mergeMattias Jonsson2010-08-191-0/+5
| | |\
| | | * mergeMattias Jonsson2010-08-191-0/+5
| | | |\
| | | | * Bug#46086: crash when dropping a partitioned tableMattias Jonsson2010-07-081-0/+5
| | | * | WL#5370 Keep forward-compatibility when changing2010-08-181-0/+1
| | | * | merge from 5.1-mtrBjorn Munch2010-08-061-2/+2
| | | |\ \
| | | * | | Bug#55501: Disable innodb plugin usage in the embedded server on certain OSesDavi Arnaut2010-07-231-0/+1
| | | * | | Bug#54453: Failing assertion: trx->active_trans when renaming aDavi Arnaut2010-07-201-2/+2
| | | | |/ | | | |/|
| * | | | mysqlhotcopy tests fixed.Alexey Botchkov2010-08-231-1/+1
| * | | | Merge from mysql-5.5-runtime to mysql-5.5-bugfixing.Jon Olav Hauglid2010-08-204-29/+46
| |\ \ \ \
| | * \ \ \ Merge from mysql-5.5-bugfixing to mysql-5.5-runtimeJon Olav Hauglid2010-08-183-5/+2
| | |\ \ \ \
| | * \ \ \ \ Manual merge from mysql-5.5-bugfixing to mysql-5.5-runtime.Jon Olav Hauglid2010-08-181-2/+2
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | Bug#55001 Change in behavior: thread_concurrency (docs, Magne Mahre2010-08-161-10/+0
| | * | | | | Merge from mysql-5.5-bugfixing to mysql-5.5-runtime.Jon Olav Hauglid2010-08-131-0/+30
| | |\ \ \ \ \
| | * \ \ \ \ \ Commit on behalf of Dmitry Lenev.Konstantin Osipov2010-08-121-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Fix for bug #52044 "FLUSH TABLES WITH READ LOCK and FLUSHDmitry Lenev2010-07-271-1/+1
| | * | | | | | | Part of fix for bug#52044 "FLUSH TABLES WITH READ LOCK andDmitry Lenev2010-08-063-18/+45
| | |/ / / / / /
| * | | | | | | Bug#54916 GROUP_CONCAT + IFNULL truncates outputAlexander Barkov2010-08-191-0/+102
| | |_|_|/ / / | |/| | | | |
| * | | | | | WL#5370 Keep forward-compatibility when changing 2010-08-183-5/+2
| | |_|/ / / | |/| | | |
* | | | | | merged mysql-5.5 into WL1054-5.5Georgi Kodinov2010-08-162-2/+32
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Auto-merge from mysql-5.5-bugfixing.Alexander Nozdrin2010-08-121-0/+30
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | fix for Bug #55672 "mysql_upgrade dies with internal error":Guilhem Bichot2010-08-111-0/+30
| | |/ / /
| * | | | merge from trunk-mtrBjorn Munch2010-08-051-2/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | upmerge 55582Bjorn Munch2010-08-051-2/+2
| | |\ \ \ | | | | |/ | | | |/|
| | | * | merge from 5.1Bjorn Munch2010-08-041-0/+121
| | | |\ \
| | | * | | Bug #55582 mtr root detection (and if-expression execution) brokenBjorn Munch2010-08-031-2/+2
* | | | | | WL#1054: Pluggable authentication supportGeorgi Kodinov2010-08-091-0/+4
|/ / / / /
* | | | | merge from mysql-trunk-bugfixingJon Olav Hauglid2010-07-195-11/+42
|\ \ \ \ \ | |/ / / /
| * | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge.Davi Arnaut2010-07-152-1/+39
| |\ \ \ \
| * \ \ \ \ Manual merge2010-07-041-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Postfix for bug#483212010-07-041-1/+1
| * | | | | Manul merge2010-07-042-11/+42
| |\ \ \ \ \ | | |/ / / /
| | * | | | The following statements support the CURRENT_USER() where a user is needed.2010-07-042-11/+42
| | | |_|/ | | |/| |
| * | | | Unset the execute bit where it's not needed.Davi Arnaut2010-07-033-0/+0
| * | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-282-42/+11
| |\ \ \ \ | | |/ / /
| | * | | Revert Bug#48321 due to build breakage and failing tests.Davi Arnaut2010-06-282-42/+11
| * | | | Manual merge2010-06-272-11/+42
| |\ \ \ \ | | |/ / /
| | * | | The following statements support the CURRENT_USER() where a user is needed.2010-06-272-11/+42
* | | | | merge from mysql-trunk-bugfixingJon Olav Hauglid2010-07-132-1/+39
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Bug#54668 User variable assignments get wrong typeAlexander Barkov2010-07-091-0/+19
| * | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-081-1/+1
| * | | | Bug#52159 returning time type from function and empty left join causes debug ...Alexander Barkov2010-07-071-0/+19
| |/ / /
* | | | Bug #54401 assert in Diagnostics_area::set_eof_status , HANDLERJon Olav Hauglid2010-07-051-0/+32
|/ / /
* | | Merge trunk-bugfixing -> trunk-runtimeKonstantin Osipov2010-06-1719-122/+316
|\ \ \
| * \ \ Auto-merge from mysql-trunk.Alexander Nozdrin2010-06-1719-122/+316
| |\ \ \
| | * \ \ Manual merge from mysql-trunk-bugfixing.Alexander Nozdrin2010-06-076-1/+341
| | |\ \ \
| | * \ \ \ mergeGeorgi Kodinov2010-06-041-0/+121
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Patch for bug#52913: Inserted check if mysqlhotcopy script is existing as req...Horst.Hunger2010-06-041-0/+5