summaryrefslogtreecommitdiff
path: root/BitKeeper
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \
| | * \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0vtkachenko@intelp4d.mysql.com2004-12-311-0/+1
| | |\ \ \ \ \
| | | * | | | | logging_ok:vtkachenko@intelp4d.mysql.com2004-12-241-0/+1
* | | | | | | | mergejoreland@mysql.com2004-12-311-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0joreland@mysql.com2004-12-311-0/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge with global treemonty@mysql.com2004-12-311-0/+4
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge with 4.1monty@mishka.local2004-12-221-0/+4
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| / / / / | | | | |/ / / /
| | | | * | | | fill_help_tables.sh:paul@frost.snake.net2004-12-181-0/+1
| | | | * | | | my-innodb-heavy-4G.cnf.sh:matt@booty.(none)2004-12-171-0/+1
| | | | | |/ / | | | | |/| |
| | | | * | | mergejoreland@mysql.com2004-12-171-0/+5
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
| | | | | * | Add (optional) endian parameter to 'get nodeid' to warn on endian conflicts.stewart@mysql.com[stewart]2004-12-061-0/+1
| | * | | | | Merge from 4.1: fix for bug #7285 (embedded server)georg@beethoven.site2004-12-301-0/+1
| | |/ / / /