summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal:/home/bk/mysql-5.0tulin@mysql.com2005-02-049-10/+145
|\
| * ha_ndbcluster.cc:tulin@mysql.com2005-02-041-2/+2
| * Merge bk-internal:/home/bk/mysql-5.0mysqldev@mysql.com2005-02-049-10/+145
| |\
| | * resolved merge conflictmysqldev@mysql.com2005-02-049-10/+145
| | |\
| | | * Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2005-02-046-6/+121
| | | |\
| | | | * added test to trigger drifferent fragmentations in ndbtomas@poseidon.ndb.mysql.com2005-02-046-6/+121
| | | * | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ramil@mysql.com2005-02-042-0/+10
| | | |\ \
| | | | * | type_float.result.es updated.ramil@mysql.com2005-02-042-0/+10
| | | * | | Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-4.1timour@mysql.com2005-02-043-4/+24
| | | |\ \ \
| | | | * \ \ Merge mysql.com:/home/timka/mysql/src/4.1-dbgtimour@mysql.com2005-02-043-4/+24
| | | | |\ \ \ | | | | | |_|/ | | | | |/| |
| | | | | * | Merge mysql.com:/home/timka/mysql/src/4.1-dbgtimour@mysql.com2005-02-023-4/+24
| | | | | |\ \
| | | | | | * | Fix for BUG#8023.timour@mysql.com2005-02-023-4/+24
* | | | | | | | mysql-test-run.sh:kent@mysql.com2005-02-041-2/+2
* | | | | | | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0marko@hundin.mysql.fi2005-02-041-6/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | InnoDB: A small cleanup: remove two duplicate rec_get_offsets() callsmarko@hundin.mysql.fi2005-02-041-6/+0
* | | | | | | | | Merge neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0msvensson@neptunus.homeip.net2005-02-04138-1281/+2431
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0guilhem@mysql.com2005-02-041-0/+11
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Proposal to fix this problem: when using libmysqlclient, you must call mysql_...guilhem@mysql.com2005-02-041-0/+11
| * | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0ramil@mysql.com2005-02-041-0/+270
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perlkent@mysql.com2005-02-041-0/+270
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2005-02-044-6/+46
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | * | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2005-02-031-0/+270
| | | |\ \ \ \ \ \
| | | | * | | | | | mtr_cases.pl:kent@mysql.com2005-02-031-0/+270
| * | | | | | | | | type_ranges.result.es updated.ramil@mysql.com2005-02-041-86/+90
| * | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0ramil@mysql.com2005-02-042-1/+14
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | type_float.result.es updatedramil@mysql.com2005-02-042-1/+14
| * | | | | | | | | Mergepekka@mysql.com2005-02-044-9/+51
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | / / / / / | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1acurtis@pcgem.rdg.cyberkinetica.com2005-02-031-0/+28
| | |\ \ \ \ \ \ \
| | | * | | | | | | ndb - sol9x86: cc -xO3: fix optimizer error.pekka@mysql.com2005-02-031-0/+28
| | | |/ / / / / /
| | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1acurtis@pcgem.rdg.cyberkinetica.com2005-02-033-6/+18
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Bug#8057acurtis@pcgem.rdg.cyberkinetica.com2005-02-033-6/+18
| | * | | | | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1mikael@orca.ndb.mysql.com2005-02-035-490/+668
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1mronstrom@mysql.com2005-02-032-14/+22
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0acurtis@pcgem.rdg.cyberkinetica.com2005-02-033-10/+29
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Bug#6726 - failure to parse NOT BETWEENacurtis@pcgem.rdg.cyberkinetica.com2005-02-033-10/+29
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0guilhem@mysql.com2005-02-0335-324/+543
| |\ \ \ \ \ \ \ \
| | * | | | | | | | result update after mergeguilhem@mysql.com2005-02-032-13/+13
| | * | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0guilhem@mysql.com2005-02-0333-311/+530
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0guilhem@mysql.com2005-02-0333-311/+530
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | WL#1062 "log charset info into all Query_log_event":guilhem@mysql.com2005-02-0333-311/+530
| * | | | | | | | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0mikael@orca.ndb.mysql.com2005-02-035-490/+668
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perlkent@mysql.com2005-02-034-490/+667
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | / / / / | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | | * | | | | | | | mysql-test-run.pl:kent@mysql.com2005-02-034-490/+667
| | | | |_|/ / / / / | | | |/| | | | | |
| * | | | | | | | | Merge mysql.com:/Users/mikron/mysql-4.1mronstrom@mysql.com2005-02-032-14/+22
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | / / / / | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Fixed a bug in the ndbd scheduler with send of packed signals.mronstrom@mysql.com2005-01-312-14/+22
| * | | | | | | | Merge mysql.com:/home/mysqldev/tulin/mysql-4.1mysqldev@mysql.com2005-02-032-3/+6
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | made an .sh file of ndb-config-2-node.ini insteadtulin@mysql.com2005-02-032-3/+6
| * | | | | | | | Merge mysql.com:/home/mysqldev/tulin/mysql-4.1mysqldev@mysql.com2005-02-032-0/+137
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | ndbcluster rpmstulin@mysql.com2005-02-032-0/+137
| * | | | | | | | corrected automerge errormysqldev@mysql.com2005-02-0326-122/+75
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /