summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix for bug#18437 "Wrong values inserted with a before update trigger ondlenev@mysql.com2006-07-0218-39/+556
* Merge knielsen@10.100.52.19:/usr/local/mysql/tmp-5.0knielsen@mysql.com2006-06-241-0/+1
|\
| * Fix race condition in test case wait_timeout.knielsen@mysql.com2006-06-241-0/+1
* | key.result:evgen@moonbone.local2006-06-231-2/+2
* | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2006-06-2328-28/+1303
|\ \
| * \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0konstantin@mysql.com2006-06-2321-15/+1155
| |\ \
| | * \ Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50pekka@clam.ndb.mysql.com2006-06-2221-15/+1155
| | |\ \
| | | * | ndb - bug#18781 (5.0) handle rolling upgrade, minor fixes, logging, docspekka@clam.ndb.mysql.com2006-06-118-47/+278
| | | * | ndb - bug#18781 lock DICT during node restartpekka@clam.ndb.mysql.com2006-06-0819-15/+924
| * | | | Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0kroki@mysql.com2006-06-221-8/+12
| |\ \ \ \
| | * \ \ \ Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0kroki@mysql.com2006-06-221-8/+12
| | |\ \ \ \
| | | * | | | Bug#15811: extremely long time for mysql client to execute long INSERTkroki@mysql.com2006-06-221-8/+12
| * | | | | | Merge mysql.com:/opt/local/work/mysql-5.0-rootkonstantin@mysql.com2006-06-226-5/+136
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | |
| | * | | | A fix and a test case for Bug#15217 "Using a SP cursor on a table createdkonstantin@mysql.com2006-06-223-1/+51
| | * | | | Fix for bug#19634 "Re-execution of multi-delete which involve trigger/storeddlenev@mysql.com2006-06-213-4/+85
* | | | | | Merge moonbone.local:/work/tmp_merge-4.1-opt-mysqlevgen@moonbone.local2006-06-234-21/+22
|\ \ \ \ \ \
| * | | | | | Bug#11228: DESC shows arbitrary column as "PRI"bar@mysql.com2006-06-233-21/+21
| * | | | | | mysql.spec.sh:kent@mysql.com2006-06-231-0/+1
* | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2006-06-225-15/+78
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0jani@a193-229-222-105.elisa-laajakaista.fi2006-06-211-0/+20
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0jani@a193-229-222-105.elisa-laajakaista.fi2006-06-213-0/+31
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge bk://localhost:5559jani@a193-229-222-105.elisa-laajakaista.fi2006-06-213-16/+21
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Cleanup to patch for Bug#18246, "compilation error with tcp_wrapper"jani@ua141d10.elisa.omakaista.fi2006-06-213-16/+21
| * | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0jani@a193-229-222-105.elisa-laajakaista.fi2006-06-211-0/+12
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0jani@a193-229-222-105.elisa-laajakaista.fi2006-06-2113-22/+112
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0jani@a193-229-222-105.elisa-laajakaista.fi2006-06-215-5/+63
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Fix for Bug#18246 "compilation error with tcp_wrapper"jani@ua141d10.elisa.omakaista.fi2006-06-215-5/+63
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
* | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2006-06-2218-22/+175
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Manual mergeevgen@moonbone.local2006-06-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1evgen@moonbone.local2006-06-223-13/+73
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fixed bug #14896.evgen@moonbone.local2006-06-223-13/+73
| * | | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2006-06-2218-22/+175
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0mats@mysql.com2006-06-211-0/+20
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Bug#19437 (Connection refused by server: "2002 Can't connect... /master.sock"):mats@mysql.com2006-06-201-0/+20
| | * | | | | | | | | | | Merge may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1svoj@may.pils.ru2006-06-213-0/+31
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | / / / / | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1svoj@may.pils.ru2006-06-211-1/+2
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | added missing MYSQLTEST_VARDIR declarationtomas@poseidon.ndb.mysql.com2006-06-211-1/+2
| | | * | | | | | | | | Merge april:devel/BitKeeper/mysql-4.1svoj@may.pils.ru2006-06-213-0/+31
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | BUG#20357 - Got error 124 from storage engine using MIN and MAXsvoj@may.pils.ru2006-06-213-0/+31
| | * | | | | | | | | | Merge knielsen@10.100.52.19:/usr/local/mysql/mysql-5.0knielsen@mysql.com2006-06-211-0/+12
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| | | * | | | | | | | | BUG#20578knielsen@mysql.com2006-06-211-0/+12
| | * | | | | | | | | | Merge mysql.com:/M50/bug19353-5.0 into mysql.com:/M50/autopush-5.0joerg@mysql.com2006-06-212-5/+29
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix for bug#18516 (also #19353, reported for 5.1):joerg@mysql.com2006-06-202-5/+29
| | * | | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold@mysql.com2006-06-214-6/+60
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/marty/MySQL/mysql-5.0-backedmskold@mysql.com2006-06-214-6/+60
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | Fix for Bug #19906 REPLACE doesn't update TEXT fields correctlymskold@mysql.com2006-06-214-6/+60
| | * | | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0tomas@poseidon.ndb.mysql.com2006-06-215-6/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0tomas@poseidon.ndb.mysql.com2006-06-215-6/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0tomas@poseidon.ndb.mysql.com2006-06-205-6/+9
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0tomas@poseidon.ndb.mysql.com2006-06-205-6/+9
| | | | | |\ \ \ \ \ \ \ \ \ \