summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* manual merge 5.0-bugteam --> 5.1-bugteamGleb Shchepa2008-09-304-11/+39
|\
| * Fixed bug #17823: 'arc' directories inside database directories.Gleb Shchepa2008-09-304-11/+39
* | mergingAlexey Botchkov2008-09-303-1/+20
|\ \ | |/
| * Bug#37949 Crash if argument to SP is a subquery that returns more than one row Alexey Botchkov2008-09-293-1/+20
* | AutomergeKristofer Pettersson2008-09-2518-135492/+135621
|\ \
| * \ mergeMattias Jonsson2008-09-2312-135378/+135568
| |\ \
| | * | Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or mem...Mattias Jonsson2008-09-1812-135378/+135568
| * | | merge of changesPatrick Crews2008-09-222-59/+49
| |\ \ \
| | * | | Bug #37312 Make tests binlog_row_innodb_stat and binlog_stm_innodb_stat more...Magnus Svensson2008-09-222-59/+49
| * | | | Bug#37312 Make tests binlog_row_innodb_stat and binlog_stm_innodb_stat more r...Patrick Crews2008-09-224-55/+4
| |/ / /
* | | | Merge 5.0-bugteam -> 5.1-bugteamKristofer Pettersson2008-09-204-2/+48
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | AutomergeKristofer Pettersson2008-09-204-2/+48
| |\ \
| | * | Bug#38469 invalid memory read and/or crash with utf8 text field, stored proce...Kristofer Pettersson2008-09-204-2/+48
| * | | Restore team tree name.Davi Arnaut2008-09-201-1/+1
* | | | Merge 5.0 -> 5.1Matthias Leich2008-09-180-0/+0
|\ \ \ \ | |/ / /
| * | | Merge actual tree -> local treeMatthias Leich2008-09-185-4/+316
| |\ \ \
* | \ \ \ Merge actual bugteam tree -> local treeMatthias Leich2008-09-1811-7/+371
|\ \ \ \ \
| * \ \ \ \ auto-mergeTatiana A. Nurnberg2008-09-186-3/+48
| |\ \ \ \ \
| | * \ \ \ \ Merge Bug#37312.Chad MILLER2008-09-186-3/+48
| | |\ \ \ \ \
| | | * | | | | Bug#37312: Make test binlog_{row,stm}_innodb_stat more robustChad MILLER2008-09-086-3/+48
| * | | | | | | manual mergeTatiana A. Nurnberg2008-09-182-6/+10
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | | | |_|/ / / | | |/| | | |
| | * | | | | Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DAT...Tatiana A. Nurnberg2008-09-182-5/+8
| | * | | | | auto-mergeTatiana A. Nurnberg2008-09-171-5/+10
| | |\ \ \ \ \
| * | \ \ \ \ \ auto-mergeTatiana A. Nurnberg2008-09-174-5/+39
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ auto-mergeTatiana A. Nurnberg2008-09-175-4/+319
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DAT...Tatiana A. Nurnberg2008-09-175-4/+313
* | | | | | | | | Upmerge 5.0 -> 5.1 of fix for Bug#38184Matthias Leich2008-09-162-30/+86
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Fix for Bug#38184 : main.federated fails sporadicallyMatthias Leich2008-09-162-54/+121
| | |_|/ / / / | |/| | | | |
* | | | | | | updated tree with mysql-5.1-bugteamNarayanan V2008-09-161-5/+10
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ merge fix from 5.0-bugteamVladislav Vaintroub2008-09-161-5/+10
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | / / / / / | | |/ / / / / | |/| | | | |
| | * | | | | Bug#35987 - post-review fixVladislav Vaintroub2008-09-161-5/+10
| | |/ / / /
* | | | | | Bug#38338: REPLACE causes last_insert_id() to return an incorrect valueNarayanan V2008-09-163-0/+29
|/ / / / /
* | | | | AutomergeKristofer Pettersson2008-09-1522-166/+447
|\ \ \ \ \
| * \ \ \ \ merge of bug fix from parentPatrick Crews2008-09-154-92/+97
| |\ \ \ \ \
| | * | | | | Bug#39803 Test rpl.rpl_truncate_7ndb_2 failingPatrick Crews2008-09-154-92/+97
| * | | | | | Bug#37938 Test "mysqldump" lacks various INSERT statements / valuesPatrick Crews2008-09-152-0/+19
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| | * | | | Bug#37938 Test "mysqldump" lacks various INSERT statements / valuesPatrick Crews2008-09-152-0/+18
| * | | | | merge fix for 35987Vladislav Vaintroub2008-09-151-1/+61
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#35987 - crash report on windows doesn't resolve stack traces.Vladislav Vaintroub2008-09-151-1/+61
| * | | | | Bug#35720 ucs2 + pad_char_to_full_length = failureAlexander Barkov2008-09-153-1/+24
| * | | | | bug #31231 mysql_alter_table() tries to drop a non-existing tableMartin Skold2008-09-155-54/+185
| * | | | | Auto merge 5.0-bugteam -> 5.1-bugteam (empty, no changes)Timothy Smith2008-09-110-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Auto merge 5.0-build -> 5.0-bugteamTimothy Smith2008-09-107-4/+54
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Auto merge 5.1-build -> 5.1-bugteamTimothy Smith2008-09-107-18/+61
| |\ \ \ \ \
| | * \ \ \ \ Auto-merge 5.0-build -> 5.1-build (no changes)Timothy Smith2008-09-100-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge main 5.0 into 5.0-build.Joerg Bruehe2008-09-1030-76/+361
| | | |\ \ \ \
| | | * | | | | Merge from mysql-5.0.68-releaseunknown2008-09-050-0/+0
| | * | | | | | Merge main 5.1 tree into 5.1-build team tree.Joerg Bruehe2008-09-1065-136/+18842
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge from mysql-5.0-buildKent Boortz2008-08-291-1/+11
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Handle that version "level" might contain "sp1", "a".....Kent Boortz2008-08-291-1/+11
View Lorry Controller Status