summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimeandrey@example.com2006-09-273-1/+31
|\
| * Fix for bug#21311: Possible stack overrun if SP has non-latin1 nameandrey@example.com2006-09-273-1/+31
* | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0kroki/tomash@moonlight.intranet2006-09-275-34/+30
|\ \
| * | BUG#21414: SP: Procedure undroppable, to some extentkroki/tomash@moonlight.intranet2006-09-125-34/+30
* | | Merge neptunus.(none):/home/msvensson/mysql/bug22379_runtime/my50-bug22379_ru...msvensson@neptunus.(none)2006-09-263-19/+36
|\ \ \
| * | | Bug #22379 im_daemon_life_cycle.test fails on merge of 5.1 -> 5.1-enginesmsvensson@neptunus.(none)2006-09-253-19/+36
* | | | Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-treeanozdrin/alik@alik.2006-09-1125-43/+328
|\ \ \ \
| * \ \ \ Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0gluh@mysql.com/gluh.(none)2006-09-081-2/+3
| |\ \ \ \
| | * | | | configure.in : NDB version and general version must be (kept) in sync - d...joerg@trift2.2006-09-071-1/+1
| | * | | | Merge trift2.:/M50/clone-5.0joerg@trift2.2006-09-071-1/+2
| | |\ \ \ \
| | | * | | | Fix a change to "configure.in" that broke building commercial sources.joerg@trift2.2006-09-071-1/+2
| * | | | | | after merge fixgluh@mysql.com/gluh.(none)2006-09-084-14/+15
| * | | | | | after merge fixgluh@mysql.com/gluh.(none)2006-09-079-25/+30
| * | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/4.1-mergegluh@mysql.com/gluh.(none)2006-09-076-7/+40
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Bug#20393 User name truncation in mysql clientgluh@mysql.com/gluh.(none)2006-08-307-8/+45
| | * | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1evgen@moonbone.local2006-08-276-6/+100
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge tim@tsmith.mysql.internal:m/bk/41tsmith@maint1.mysql.com2006-08-247-14/+128
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/b21531-41tsmith/tim@siva.hindu.god2006-08-234-5/+13
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-41tsmith/tim@siva.hindu.god2006-08-234-9/+115
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-4.1tsmith@maint1.mysql.com2006-08-237-66/+48
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | * | | | | | | | | Merge lamia.home:/home/timka/mysql/src/4.1-virgintimour/timka@lamia.home2006-08-233-30/+52
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge hf@192.168.21.12:work/mysql-4.1.15440holyfoot/hf@mysql.com/vva.(none)2006-08-191-0/+1
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge hf@192.168.21.12:work/mysql-4.1.13717holyfoot/hf@mysql.com/vva.(none)2006-08-191-0/+7
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2006-09-066-39/+72
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Raise version numberbteam/mysqldev@mysql.com/production.mysql.com2006-09-061-1/+1
| | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Fix for BUG#11151 "LOAD DATA INFILE commits transaction in 5.0".guilhem@gbichot3.local2006-09-0510-6/+251
* | | | | | | | | | | | | | Fix for BUG#22074: mysql-test-run.pl abort test run if it failsanozdrin/alik@alik.2006-09-081-1/+4
* | | | | | | | | | | | | | This is another patch for test suite to make IM tests work smoothly.anozdrin/alik@alik.2006-09-084-698/+786
* | | | | | | | | | | | | | Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-treeanozdrin/alik@alik.2006-09-065-38/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0jonas@perch.ndb.mysql.com2006-09-065-38/+71
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2006-09-045-38/+71
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/41-workjonas@perch.ndb.mysql.com2006-09-043-4/+14
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | bug#21965 - replicationjonas@perch.ndb.mysql.com2006-09-043-4/+14
| | | * | | | | | | | | | | | ndb - bug#21615jonas@perch.ndb.mysql.com2006-08-281-30/+48
| | | * | | | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/41-workjonas@perch.ndb.mysql.com2006-08-241-4/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / /
| | | | * | | | | | | | | | | ndb - bug#21800jonas@perch.ndb.mysql.com2006-08-241-4/+9
* | | | | | | | | | | | | | | Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-treeanozdrin/alik@alik.2006-09-055-26/+87
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Trivial fix: pid file must exist when kill_n_check.sh is started.anozdrin/alik@alik.2006-09-011-1/+1
| * | | | | | | | | | | | | | Fix typo, which prevents test suite from correct cleanup.anozdrin/alik@alik.2006-09-011-6/+5
| * | | | | | | | | | | | | | Fix for BUG#12751: Instance Manager: client hangs afteranozdrin/alik@alik.2006-09-013-19/+81
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge dl145s:/data/tkatchaounov/5.0-bug-21787msvensson@neptunus.(none)2006-09-043-7/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge timka@10.100.64.80:/home/timka/mysql/src/4.1-bug-21787timour/tkatchaounov@dl145s.mysql.com2006-09-013-7/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Fix for BUG#21787: COUNT(*) + ORDER BY + LIMIT returns wrong resulttimour/timka@lamia.home2006-09-013-5/+38
* | | | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@neptunus.(none)2006-09-043-1/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-mainttnurnberg@maint1.mysql.com2006-09-043-1/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge salvation.intern.azundris.com:/home/tnurnberg/21913/my41-21913tnurnberg@salvation.intern.azundris.com2006-09-043-1/+36
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-conne...tnurnberg@salvation.intern.azundris.com2006-09-043-1/+36
| * | | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0tsmith@maint1.mysql.com2006-09-034-28/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0-optmsvensson@neptunus.(none)2006-09-048-7/+104
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-optsergefp@mysql.com2006-09-014-6/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \