summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold/marty@mysql.com/linux.site2006-12-053-5/+16
|\
| * Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-optgkodinov@dl145s.mysql.com2006-12-043-5/+16
| |\
| | * type_varchar.result:gkodinov/kgeorge@macbook.gmz2006-12-041-0/+1
| | * item_func.cc:gkodinov/kgeorge@macbook.gmz2006-12-042-5/+15
* | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold/marty@mysql.com/linux.site2006-12-0436-157/+682
|\ \ \ | |/ / |/| |
| * | Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2006-12-011-0/+9
| |\ \
| | * | ndb - bug#24752jonas@perch.ndb.mysql.com2006-12-011-0/+9
| * | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2006-12-0122-48/+279
| |\ \ \ | | |/ /
| | * | ndb - bug#24748jonas@perch.ndb.mysql.com2006-12-011-1/+4
| | * | ndb -jonas@perch.ndb.mysql.com2006-12-015-6/+64
| | * | ndb - bug#24717jonas@perch.ndb.mysql.com2006-12-0110-19/+87
| | * | ndb - bug#24503jonas@perch.ndb.mysql.com2006-11-221-9/+0
| | * | ndb - bug#24503jonas@perch.ndb.mysql.com2006-11-225-7/+38
| | * | Merge perch.ndb.mysql.com:/home/jonas/src/41-workjonas@perch.ndb.mysql.com2006-11-221-8/+10
| | |\ \
| | | * | ndb - bug#24461jonas@perch.ndb.mysql.com2006-11-221-8/+10
| | * | | Merge perch.ndb.mysql.com:/home/jonas/src/41-workjonas@perch.ndb.mysql.com2006-11-221-4/+0
| | |\ \ \ | | | |/ /
| | | * | ndb - bug#24461 - LockPagesInMemory ignoredjonas@perch.ndb.mysql.com2006-11-221-4/+0
| | * | | Merge perch.ndb.mysql.com:/home/jonas/src/41-workjonas@perch.ndb.mysql.com2006-11-214-4/+86
| | |\ \ \ | | | |/ /
| | | * | ndb -jonas@perch.ndb.mysql.com2006-11-211-1/+6
| | | * | ndb - bug#24447jonas@perch.ndb.mysql.com2006-11-213-3/+80
| * | | | Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bjgni/root@ts3-168.ts.cn.tlan2006-12-015-13/+39
| |\ \ \ \
| | * \ \ \ Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bjlzhou/root@dev3-138.dev.cn.tlan2006-11-021-6/+8
| | |\ \ \ \
| | | * \ \ \ Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-4.1/bug19352lzhou/root@dev3-138.dev.cn.tlan2006-11-021-6/+8
| | | |\ \ \ \
| | | | * | | | BUG#19352 return exact error message when parameters overflow in 32-bit platf...lzhou/root@dev3-138.dev.cn.tlan2006-11-011-6/+8
| | * | | | | | Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bjlzhou/root@dev3-138.dev.cn.tlan2006-11-013-6/+12
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | BUG#21052 Modify the overflow error existed in last patch.lzhou/root@dev3-138.dev.cn.tlan2006-11-013-6/+12
| | * | | | | | BUG #21858 Make sure retry when EINTR returns, which decreases memory leak ch...gni/root@dev3-127.(none)2006-10-081-3/+15
| * | | | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0mskold/marty@mysql.com/linux.site2006-11-302-9/+11
| |\ \ \ \ \ \ \
| | * | | | | | | bug#18487 UPDATE IGNORE not supported for unique constraint violation of non...mskold/marty@mysql.com/linux.site2006-11-302-8/+9
| | * | | | | | | bug#18487 UPDATE IGNORE not supported for unique constraint violation of non...mskold/marty@mysql.com/linux.site2006-11-301-2/+3
| * | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold/marty@mysql.com/linux.site2006-11-3012-90/+347
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0mskold/marty@mysql.com/linux.site2006-11-303-0/+29
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | #18487 UPDATE IGNORE not supported for unique constraint violation of non-pr...mskold/marty@mysql.com/linux.site2006-11-303-0/+17
| | | * | | | | | | bug#24303 Wrong result for UPDATE IGNORE for NDB table: Added test casemskold/marty@mysql.com/linux.site2006-11-292-0/+12
| | * | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2006-11-212-1/+5
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | ndb -jonas@perch.ndb.mysql.com2006-11-212-8/+7
| | * | | | | | | | Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndbpekka@orca.ndb.mysql.com2006-11-163-2/+3
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | ndb - fix test case: testDict -n Restart_NR* T1 I3pekka@orca.ndb.mysql.com2006-11-022-2/+2
| | | * | | | | | | | ndb - flush signal log when it is turned offpekka@orca.ndb.mysql.com2006-11-021-0/+1
| | * | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbmskold/marty@mysql.com/linux.site2006-11-141-2/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix for Bug #23887 (Introduced by Bugfix #22295)hartmut@mysql.com/linux.site2006-11-131-2/+1
| | | | |_|/ / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold/marty@mysql.com/linux.site2006-11-145-85/+309
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbmskold/marty@mysql.com/linux.site2006-11-134-53/+259
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | bug#21507 I can't create a unique hash index in NDB: Added possibillity to cr...mskold/marty@mysql.com/linux.site2006-11-074-53/+259
| | | | |/ / / / / / /
| | | * | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2006-11-061-32/+50
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| / / / / / / | | | | |/ / / / / /
| | | | * | | | | | ndb - bug#24011jonas@perch.ndb.mysql.com2006-11-061-33/+51
* | | | | | | | | | mysql_install_db.sh:kent@mysql.com/kent-amd64.(none)2006-12-023-34/+49
* | | | | | | | | | Makefile.am:kent@mysql.com/kent-amd64.(none)2006-12-022-0/+12
* | | | | | | | | | Merge mysql.com:/home/kent/bk/mysql-4.1-buildkent@mysql.com/kent-amd64.(none)2006-12-020-0/+0
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1df@kahlann.erinye.com2006-12-012-1/+2
| |\ \ \ \ \ \ \ \ \ \