summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mergeSven Sandberg2008-07-031-1/+3
|\
| * Up-merge syntax fix from 5.0-bugteam.Timothy Smith2008-07-021-1/+3
| |\
| | * Fix "C++ code in C file" syntax error in mysys/default.cTimothy Smith2008-07-021-1/+3
* | | BUG#37200: rpl_switch_stm_row_mixed fails sporadically in pushbuildSven Sandberg2008-07-031-5/+4
|/ /
* | BUG#37200: rpl_switch_stm_row_mixed fails sporadically in pushbuildSven Sandberg2008-07-021-1/+4
* | upmerge into 5.1Patrick Crews2008-07-011-5/+0
|\ \ | |/
| * Bug#37380 - Test funcs_1.is_columns_myisam_embedded fails on OS XPatrick Crews2008-07-011-5/+0
* | BUG#37200: rpl_switch_stm_row_mixed fails sporadically in pushbuildSven Sandberg2008-06-301-0/+8
* | Up-merge from 5.0: Merge from upstream (my:5.0-bugteam)Timothy Smith2008-06-270-0/+0
|\ \ | |/
| * Merge from upstream (my:5.0-bugteam)Timothy Smith2008-06-27112-5745/+8914
| |\
* | \ Up-merge from 5.0: Fix for Bug#20748, Configuration files should not be read ...Timothy Smith2008-06-271-136/+130
|\ \ \ | |/ /
| * | Bug #20748: Configuration files should not be read more than onceTimothy Smith2008-06-241-155/+129
* | | auto merge from local treeGleb Shchepa2008-06-273-0/+50
|\ \ \
| * | | Fixed bug #36632: SELECT DISTINCT from a simple view on anGleb Shchepa2008-06-273-0/+50
* | | | merge 5.0-bugteam --> 5.1-bugteamGleb Shchepa2008-06-270-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | backport from 6.0Gleb Shchepa2008-06-273-11/+77
* | | | backport to 5.1 from 6.0Gleb Shchepa2008-06-273-11/+77
* | | | Upmerge 5.0 -> 5.1Matthias Leich2008-06-252-109/+181
|\ \ \ \ | |/ / /
| * | | Fix forMatthias Leich2008-06-252-108/+180
* | | | auto merge 5.1-main --> 5.1-bugteamGleb Shchepa2008-06-2514-243/+342
|\ \ \ \
| * \ \ \ auto mergeTatiana A. Nurnberg2008-06-216-26/+78
| |\ \ \ \
| | * | | | Correct the version number, after cloning 5.1.26 the next one is 27Joerg Bruehe2008-06-201-1/+1
| | * | | | Raise version number after cloning 5.1.26Joerg Bruehe2008-06-201-1/+1
| | * | | | merging prior to push Bug #36443Andrei Elkin2008-06-209-218/+265
| | |\ \ \ \
| | * | | | | Bug#36443 Server crashes when executing insert when insert trigger on tableAndrei Elkin2008-06-195-25/+77
| * | | | | | Bug#33812: mysql client incorrectly parsing DELIMITERTatiana A. Nurnberg2008-06-203-31/+8
| | |/ / / / | |/| | | |
| * | | | | re 36818: rpl_server_id1 fails expecting slave has stoppedTatiana A. Nurnberg2008-06-191-0/+1
| * | | | | Bug#36434: ha_innodb.so is installed in the wrong directoryTatiana A. Nurnberg2008-06-191-1/+1
| * | | | | Bug#35480: BOM detection code crashes mysql CLI with zero-sized inputTatiana A. Nurnberg2008-06-191-1/+1
| * | | | | Fixed bug #37004.Tatiana A. Nurnberg2008-06-193-0/+21
| * | | | | Merge changes from mysql 5.1.25 release clone (BK), applied manually into bzr.Timothy Smith2008-06-173-216/+241
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | fix typoTimothy Smith2008-06-172-2/+2
| | * | | | Bug #37024: Wrong location of messagefilesTimothy Smith2008-06-171-214/+239
* | | | | | auto merge 5.0-bugteam --> 5.1-bugteamGleb Shchepa2008-06-243-33/+24
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | back-port from 5.1.Gleb Shchepa2008-06-241-1/+1
| * | | | | back-port from 5.1.Gleb Shchepa2008-06-243-31/+8
| * | | | | Bug #36244: MySQL CLI doesn't recognize standalone -- Gleb Shchepa2008-06-242-1/+15
* | | | | | Automatic mergeMatthias Leich mleich@mysql.com2008-06-20184-5657/+9737
|\ \ \ \ \ \
| * \ \ \ \ \ 1. Upmerge of fix for the bugsMatthias Leich mleich@mysql.com2008-06-18184-5657/+9737
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix forMatthias Leich mleich@mysql.com2008-06-18104-5593/+8633
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Fix forMatthias Leich mleich@mysql.com2008-06-16104-5593/+8633
* | | | | | | Silence unused variable warning by printing the variables value.Davi Arnaut2008-06-191-0/+2
* | | | | | | auto mergeGleb Shchepa2008-06-195-60/+96
|\ \ \ \ \ \ \
| * | | | | | | Bug#37003 Tests sporadically crashes with embedded serverDavi Arnaut2008-06-195-60/+96
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | auto merge with local tree (bug #37076)Gleb Shchepa2008-06-195-66/+162
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fixed bug #37076: TIMESTAMP/DATETIME/DATE values are notGleb Shchepa2008-06-195-66/+162
| |/ / / / /
* | | | | | Bug#37003 Tests sporadically crashes with embedded serverDavi Arnaut2008-06-1817-115/+227
* | | | | | Bug#33873: Fast ALTER TABLE doesn't work with multibyte character setsDavi Arnaut2008-06-175-80/+152
|/ / / / /
* | | | | auto mergeMattias Jonsson2008-06-173-7/+17
|\ \ \ \ \
| * \ \ \ \ auto mergeGeorgi Kodinov2008-06-170-0/+0
| |\ \ \ \ \