summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mergeKristofer Pettersson2008-07-165-29/+44
|\
| * auto mergeKristofer Pettersson2008-07-15179-6121/+10346
| |\
| * | Bug#30087 Set query_cache_size, if the value is too small, get a unclear warningKristofer Pettersson2008-06-195-17/+43
* | | merge from local tree to 5.1-bugteamGleb Shchepa2008-07-151-2/+2
|\ \ \
| * | | after-push patch: partial rollback of bug #37761 fix.Gleb Shchepa2008-07-151-2/+2
* | | | Bug#35577, manual merge mysql-5.0-bugteam -> mysql-5.1-bugteamMarc Alff2008-07-1416-117/+863
|\ \ \ \ | | |_|/ | |/| |
| * | | MergeMarc Alff2008-07-141-1/+1
| |\ \ \
| * | | | Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending onMarc Alff2008-07-1413-84/+848
* | | | | auto-mergeRamil Kalimullin2008-07-1436-5482/+5816
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Bug #37761: IN handles NULL differently for table-subquery Gleb Shchepa2008-07-143-3/+18
| | | | |
| | \ \ \
| *-. \ \ \ Fix of Bug#37997. Polling until disconnect is not more in the processlistHorst Hunger2008-07-112-20/+18
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| |
| * | | | merge 5.0-bugteam --> 5.1-bugteamGleb Shchepa2008-07-111-1/+1
| |\ \ \ \ | | |/ / /
| | * | | warning eliminationGleb Shchepa2008-07-111-1/+1
| * | | | merge 5.0-bugteam -> 5.1-bugteamGleb Shchepa2008-07-111-1/+1
| |\ \ \ \ | | |/ / /
| | * | | warning eliminationGleb Shchepa2008-07-111-1/+1
| | |/ /
| | * | auto-mergeTatiana A. Nurnberg2008-07-1014-31/+151
| | |\ \
| * | | | Fixed build warning on Windows (emb_qcache.cc)Marc Alff2008-07-101-1/+2
| * | | | auto-mergeTatiana A. Nurnberg2008-07-1027-5446/+5692
| |\ \ \ \
| | * \ \ \ null merge 5.0-bugteam --> 5.1-bugteamGleb Shchepa2008-07-100-0/+0
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | merge 5.0-main --> 5.0-bugteamGleb Shchepa2008-07-109-7/+37
| | | |\ \ \
| | | | * | | Raise version number after cloning 5.0.66unknown2008-07-091-2/+2
| | | | * | | Merge from trunk.Jonathan Perkin2008-07-08173-6334/+12454
| | | | |\ \ \
| | | | * | | | Use skip-federated by default in all example configs.Jonathan Perkin2008-06-105-0/+15
| | * | | | | | merge 5.1-main --> 5.1-bugteamGleb Shchepa2008-07-104-6/+21
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Upmerge 5.0 -> 5.1Matthias Leich2008-07-013-5/+20
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | * | | | | Fix forMatthias Leich2008-06-303-5/+20
| | | * | | | | | We may need 5.1.27 for selected pushes, so reserve the number.Joerg Bruehe2008-06-301-1/+1
| | * | | | | | | Upmerge 5.0 -> 5.1Matthias Leich2008-07-095-24/+114
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | 1. Fix for Bug#37160Matthias Leich2008-07-095-24/+114
| | * | | | | | | mergeMattias Jonsson2008-07-0918-5416/+5557
| | |\ \ \ \ \ \ \
| | | * | | | | | | Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'Mattias Jonsson2008-07-0918-5416/+5557
| * | | | | | | | | Bug#35848: UUID() returns UUIDs with the wrong timeTatiana A. Nurnberg2008-07-103-12/+86
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | / / | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Bug#35848: UUID() returns UUIDs with the wrong timeTatiana A. Nurnberg2008-07-103-12/+86
| | | |/ / / / / | | |/| | | | |
* | | | | | | | Fix for bug#37669: Server crash by setting "@@session.innodb_table_locks"Ramil Kalimullin2008-07-091-2/+2
|/ / / / / / /
* | | | | | | Fixed remaining test failureMarc Alff2008-07-081-6/+2
* | | | | | | Cleanup merge issues in mysql-test/t/parser.testMarc Alff2008-07-084-1344/+1217
* | | | | | | Bug#37525 funcs_1: <engine>_storedproc.test failMarc Alff2008-07-084-21/+20
* | | | | | | Manual merge of mysql-5.0-bugteam -> mysql-5.1-bugteamMats Kindahl2008-07-085-1218/+1351
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Manual merge with mysql-5.0-bugteamMats Kindahl2008-07-0840-102/+220
| |\ \ \ \ \ \
| | * \ \ \ \ \ MergeMarc Alff2008-07-0730-31/+31
| | |\ \ \ \ \ \
| * | | | | | | | Bug #37150 Risk for crash in User_var_log_event::exec_event()Mats Kindahl2008-07-071-1/+7
* | | | | | | | | merge (update of 51-bugteam, during testing for pushing...)Mattias Jonsson2008-07-087-97/+160
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Manual merge of bug#26030 in mysql-5.1-bugteamMarc Alff2008-07-077-97/+160
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Bug#26030 (Parsing fails for stored routine w/multi-statement executionMarc Alff2008-07-078-65/+186
* | | | | | | | | | mergeMattias Jonsson2008-07-0745-9556/+2013
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bug#36732: many disabled ndb tests in test suite partsMattias Jonsson2008-07-0145-9556/+2013
* | | | | | | | | | | Bug#35745: SELECT COUNT(*) is not correct for some partitioned tables.Mattias Jonsson2008-07-078-82/+111
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Bug#37627: addendum :Georgi Kodinov2008-07-074-28/+30
* | | | | | | | | | Merge from 5.0. Add new 5.1 files. Drop bdb.Chad MILLER2008-07-0435-37/+37
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge bug.Chad MILLER2008-07-0430-31/+31
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |