summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* NULL MERGE this to 5.1tsmith@siva.hindu.god2007-03-229-54/+172
* Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbjonas@perch.ndb.mysql.com2007-03-225-2/+14
|\
| * Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2007-03-221-1/+1
| |\
| | * ndb -jonas@perch.ndb.mysql.com2007-03-221-1/+1
| * | Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2007-03-214-1/+13
| |\ \ | | |/
| | * ndb - bug#27283jonas@perch.ndb.mysql.com2007-03-214-1/+13
* | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-mainttomas@whalegate.ndb.mysql.com2007-03-222-4/+9
|\ \ \
| * \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0tomas@whalegate.ndb.mysql.com2007-03-2218-16/+1168
| |\ \ \
| | * \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbtomas@whalegate.ndb.mysql.com2007-03-211-4/+7
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gcatomas@whalegate.ndb.mysql.com2007-03-211-4/+7
| | | |\ \
| | | | * | Bug #26825 MySQL Server Crashes in high loadtomas@whalegate.ndb.mysql.com2007-03-211-4/+7
| | * | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2007-03-211-0/+2
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | ndb - bug#27286 (5.0 version)jonas@perch.ndb.mysql.com2007-03-211-0/+2
* | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimetsmith@quadxeon.mysql.com2007-03-2124-144/+725
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2007-03-213-13/+14
| |\ \ \ \ \
| * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2007-03-1924-144/+725
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimemalff/marcsql@weblab.(none)2007-03-149-62/+556
| | |\ \ \ \ \ \
| | | * | | | | | Bug#26503 (Illegal SQL exception handler code causes the server to crash)malff/marcsql@weblab.(none)2007-03-149-62/+556
| | * | | | | | | Fix typo.anozdrin/alik@booka.opbmk2007-03-091-1/+1
| | * | | | | | | Polishing: use constants instead of magic numbers.anozdrin/alik@booka.opbmk2007-03-0913-48/+72
| | |/ / / / / /
| | * | | | | | Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0kroki/tomash@moonlight.home2007-03-083-3/+75
| | |\ \ \ \ \ \
| | | * | | | | | BUG#20492: Subsequent calls to stored procedure yield incorrect resultkroki/tomash@moonlight.intranet2006-09-073-3/+75
| | * | | | | | | Fix -ansi -pedantic warning (can't cast a pointer to function kostja@bodhi.local2007-03-082-3/+3
| | * | | | | | | Bug 8407, post review cleanup: use instr::get_cont_dest() to get the instructionmalff/marcsql@weblab.(none)2007-03-072-28/+19
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintiggy@recycle.(none)2007-03-211-14/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bug#27144 sp-destruct.test is disabled on Windowsiggy@recycle.(none)2007-03-211-14/+18
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintiggy@recycle.(none)2007-03-214-33/+28
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Bug#23736 Pointer free error in mysqlbinlogiggy@recycle.(none)2007-03-204-33/+28
* | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@pilot.blaudden2007-03-21178-38554/+7731
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-buildtsmith@quadxeon.mysql.com2007-03-217-32/+33
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-releasekent@mysql.com/kent-amd64.(none)2007-03-217-32/+33
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | vio.vcproj, mysqld.vcproj, mysys.vcproj, libmysqld.vcproj, mysqldemb.vcproj:kent@mysql.com/kent-amd64.(none)2007-03-206-28/+31
| | | * | | | | | | | | | mysys.vcproj:kent@mysql.com/kent-amd64.(none)2007-03-193-4/+2
| * | | | | | | | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/41tsmith@quadxeon.mysql.com2007-03-201-8/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Bug #27231: Server crash when dumping into outfile with long FIELDS ENCLOSED ...tsmith@quadxeon.mysql.com2007-03-201-8/+6
| * | | | | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbtsmith@quadxeon.mysql.com2007-03-2016-12/+1159
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2007-03-2010-9/+195
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | / / | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| | | * | | | | | | | | | ndb - bug#27283 (wl2325-5.0)jonas@perch.ndb.mysql.com2007-03-204-4/+79
| | | * | | | | | | | | | ndb - bug#27291jonas@perch.ndb.mysql.com2007-03-201-1/+1
| | | * | | | | | | | | | ndb - fix bug in UtilTransactions::comparejonas@perch.ndb.mysql.com2007-03-151-0/+1
| | | * | | | | | | | | | ndb - bug#27003jonas@perch.ndb.mysql.com2007-03-137-4/+114
| | * | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0tomas@whalegate.ndb.mysql.com2007-03-207-3/+964
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0Justin.He/justin.he@dev3-240.dev.cn.tlan2007-03-167-3/+964
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndbJustin.He/justin.he@dev3-240.dev.cn.tlan2007-03-167-3/+964
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bjJustin.He/justin.he@dev3-240.dev.cn.tlan2007-03-025-1/+961
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | correct NAND/NOR scan operations, and add a test case for it.Justin.He/justin.he@dev3-240.dev.cn.tlan2007-03-015-1/+961
| | | | | * | | | | | | | | | | Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bjgni/root@dev3-221.dev.cn.tlan2007-02-151-1/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / | | | | | |/| | | | | | | | | |
| | | | | | * | | | | | | | | | BUG#19378 Job Buffer Full error appears for too large MaxNoOfTablesgni/root@dev3-221.dev.cn.tlan2007-02-121-1/+1
| | | | | * | | | | | | | | | | Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-4.1/mysql-4.1-bug21715gni/root@dev3-221.dev.cn.tlan2007-02-151-1/+2
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | BUG#21715 mgm client command <id> status return version(0.0.0.0)gni/root@dev3-221.dev.cn.tlan2007-02-151-0/+13