summaryrefslogtreecommitdiff
path: root/BitKeeper
Commit message (Expand)AuthorAgeFilesLines
* Mergeingo@mysql.com2005-02-111-6/+13
|\
| * Merge commit triggerjimw@mysql.com2005-02-101-6/+13
| |\
| | * Merge bk-internal:/home/bk/mysql-4.0jimw@mysql.com2005-02-101-6/+13
| | |\
| | | * Add BUG# to subject and X-Bug header for all outgoingjimw@mysql.com2005-01-251-6/+13
| | * | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0ramil@mysql.com2005-02-041-0/+1
| | |/
| * | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ramil@mysql.com2005-02-041-0/+1
| |\ \
| | * | type_float.result.es updated.ramil@mysql.com2005-02-041-0/+1
| * | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1mikael@orca.ndb.mysql.com2005-02-031-0/+1
| |/ /
| * | Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1brian@zim.(none)2005-01-311-0/+1
| |\ \
| | * | Cleanup for lost file descriptors on close table for ha_archive. brian@zim.(none)2005-01-281-0/+1
| * | | BUG#8208 don't fsync unless something has been writtentulin@mysql.com2005-01-311-0/+1
| |/ /
* | | Mergeserg@serg.mylan2005-02-091-0/+1
|\ \ \
| * | | Removed old filesmskold@bk-internal.mysql.com2005-02-092-0/+393
* | | | gone:serg@serg.mylan2005-02-091-0/+393
* | | | clean up goneserg@serg.mylan2005-02-091-13/+0
|/ / /
* | | Merge neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0msvensson@neptunus.homeip.net2005-02-041-0/+2
|\ \ \
| * | | type_float.result.es updatedramil@mysql.com2005-02-041-0/+1
| * | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0mikael@orca.ndb.mysql.com2005-02-031-0/+1
* | | | Merged "query cache for ndb" to 5.0msvensson@neptunus.homeip.net2005-02-031-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Merge problem msvensson@neptunus.homeip.net2005-01-141-0/+1
| * | | Merge bk-internal:/home/bk/mysql-4.1tulin@build.mysql.com2005-01-052-0/+13
| |\ \ \
| * \ \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-4.1mysqldev@bk-internal.mysql.com2004-12-201-0/+2
| |\ \ \ \
| * \ \ \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-4.1mysqldev@bk-internal.mysql.com2004-12-171-0/+1
| |\ \ \ \ \
* | | | | | | ndb_opt_defaults.h:tulin@mysql.com2005-01-281-0/+1
* | | | | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0patg@patrick-galbraiths-computer.local2005-01-241-0/+1
|\ \ \ \ \ \ \
| * | | | | | | -Added quote_data and needs_quotes (moved from federated handler.patg@pc248.lfp.kcls.org2005-01-201-0/+1
* | | | | | | | Merge with global treemonty@mysql.com2005-01-181-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1reggie@bob.(none)2005-01-171-0/+1
| |\ \ \ \ \ \
| | * | | | | | Bug #7922 prompt \p fails on Windows for shared-memory connectionsreggie@bob.(none)2005-01-151-0/+1
| * | | | | | | Fixed memory leak in handle_local_infile()kaa@polly.local2005-01-171-0/+1
| |/ / / / / /
* | | | | | | Mergevtkachenko@mail.mysql.com2005-01-121-0/+1
|\ \ \ \ \ \ \
| * | | | | | | logging_ok:vtkachenko@mail.mysql.com2005-01-121-0/+1
* | | | | | | | Merge mysql.com:/space/my/mysql-4.1lenz@mysql.com2005-01-101-0/+235
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | - removed the mysql-test/suites/jp test suite and marked all files as gonelenz@mysql.com2005-01-101-0/+235
| | |_|_|/ / | |/| | | |
* | | | | | mergejoreland@mysql.com2005-01-071-0/+1
|\ \ \ \ \ \
| * | | | | | Fix for compiling error in sql_parsebrian@zim.(none)2005-01-061-0/+1
* | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbjoreland@mysql.com2005-01-051-0/+1
|\ \ \ \ \ \ \
| * | | | | | | ndb - getTable retry if DICT busyjonas@mysql.com2005-01-051-0/+1
* | | | | | | | Mergejoreland@mysql.com2005-01-041-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEYmonty@mysql.com2005-01-031-0/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | set_var.cc:paul@snake-hub.snake.net2005-01-021-0/+1
| | * | | | | Merged bugfixmskold@mysql.com2004-12-301-0/+1
| | |\ \ \ \ \
* | | \ \ \ \ \ Mergemskold@mysql.com2005-01-031-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge from fix for Bug #7480 Mysqld crash in ha_ndbcluster using Query Browsermskold@mysql.com2005-01-031-0/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Fix for bug #7480 Mysqld crash in ha_ndbcluster using Query Browsermarty@linux.site2004-12-301-0/+1
* | | | | | | | mergejoreland@mysql.com2005-01-011-0/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | manually mergedserg@sergbook.mysql.com2004-12-311-0/+11
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | BitKeeper/triggers/pre-deltaserg@serg.mylan2004-12-221-0/+11
| | | |_|_|/ / | | |/| | | |
* | | | | | | Merge mysql.com:/home/jonas/src/mysql-5.0joreland@mysql.com2004-12-311-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0joreland@mysql.com2004-12-311-0/+1
| |\ \ \ \ \ \