summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-01-0244-1169/+3263
|\
| * Merge cleanupmalff/marcsql@weblab.(none)2006-12-121-12/+2
| * Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtimemalff/marcsql@weblab.(none)2006-12-1210-169/+1241
| |\
| | * Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimemalff/marcsql@weblab.(none)2006-12-119-168/+1240
| | |\
| | | * minor cleanupmalff/marcsql@weblab.(none)2006-12-111-5/+0
| | | * Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimemalff/marcsql@weblab.(none)2006-12-119-168/+1245
| | | |\
| | | | * Bug#19194 (Right recursion in parser for CASE causes excessive stack usage,malff/marcsql@weblab.(none)2006-12-114-110/+220
| | | | * Bug#19194 (Right recursion in parser for CASE causes excessive stack usage,malff/marcsql@weblab.(none)2006-11-1710-168/+1135
| | * | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimemalff/marcsql@weblab.(none)2006-12-046-10/+59
| | |\ \ \ | | | |/ /
| | | * | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimepetr/cps@outpost.site2006-12-041-5/+5
| | | |\ \
| | | * | | Use standard shell instead of BASH.anozdrin/alik@booka.2006-12-041-1/+1
| | * | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimemalff/marcsql@weblab.(none)2006-11-302-1/+2
| | |\ \ \ \
| | * \ \ \ \ Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimemalff/marcsql@weblab.(none)2006-11-29330-1849/+5214
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimemalff/marcsql@weblab.(none)2006-11-170-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimemalff/marcsql@weblab.(none)2006-11-140-0/+0
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimemalff/marcsql@weblab.(none)2006-11-070-0/+0
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimemalff/marcsql@weblab.(none)2006-10-310-0/+0
| | | | | |\ \ \ \ \ \
| | | | | | * | | | | | manual mergemalff/marcsql@weblab.(none)2006-10-182-2/+54
| | | | | | * | | | | | merge hellmalff/marcsql@weblab.(none)2006-10-188-60/+424
| | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | Bug#20028 (Function with select return no data)malff/marcsql@weblab.(none)2006-10-178-8/+428
| * | | | | | | | | | | | Post-merge fixes.kostja@bodhi.local2006-12-122-3/+2
| * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2006-12-1235-987/+2020
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | remove assertpetr/cps@outpost.site2006-12-052-10/+16
| | * | | | | | | | | | | | No bug number.malff/marcsql@weblab.(none)2006-12-041-3/+3
| | * | | | | | | | | | | | Merge outpost.site:/home/cps/mysql/trees/5.0-runtime-19044petr/cps@outpost.site2006-12-041-5/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Fix Bug #19044 IM aborts on exitpetr/cps@outpost.site2006-12-041-5/+5
| | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimepetr/cps@outpost.site2006-12-044-5/+26
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fix Bug #21328 mysqld issues warnings on ALTER CSV table to MyISAMpetr/cps@outpost.site2006-12-044-5/+26
| | * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2006-12-0127-964/+1969
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtimekostja@bodhi.local2006-12-014-4/+53
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge bodhi.local:/opt/local/work/mysql-5.0-4968kostja@bodhi.local2006-12-014-4/+53
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / | | | | | |/| | | | | | | | | |
| | | | | * | | | | | | | | | | A fix and a test case for Bug#24179 "select b into $var" fails with kostja@bodhi.local2006-12-014-4/+53
| | | | | | |_|_|_|_|_|_|_|/ / | | | | | |/| | | | | | | | |
| | | * | | | | | | | | | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimemalff/marcsql@weblab.(none)2006-11-3011-4/+548
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | WL#3602malff/marcsql@weblab.(none)2006-11-305-2/+229
| | | | * | | | | | | | | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimemalff/marcsql@weblab.(none)2006-11-218-4/+321
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | WL#3602 (SET GLOBAL READONLY)malff/marcsql@weblab.(none)2006-11-208-4/+321
| | | * | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2006-11-3012-956/+1368
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | Fix for the following bugs:anozdrin/alik@booka.2006-11-3012-956/+1368
* | | | | | | | | | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1joerg@trift2.2007-01-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | server-tools/instance-manager/Makefile.amjoerg@trift2.2007-01-021-1/+1
* | | | | | | | | | | | | | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2007-01-021-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | view.result:kent@mysql.com/kent-amd64.(none)2007-01-021-4/+4
* | | | | | | | | | | | | | | | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-3179-79/+879
* | | | | | | | | | | | | | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-31460-439/+2066
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@mysql.com/kent-amd64.(none)2006-12-31524-1212/+2726
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | my_strtoll10-x86.s:kent@mysql.com/kent-amd64.(none)2006-12-31524-1212/+2726
| * | | | | | | | | | | | | | | | | Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndbstewart@willster.(none)2006-12-285-20/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0tomas@poseidon.mysql.com2006-12-279-14/+137
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2006-12-156-13/+113
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0mskold/marty@mysql.com/linux.site2006-12-072-0/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \