summaryrefslogtreecommitdiff
path: root/BitKeeper
Commit message (Expand)AuthorAgeFilesLines
* Merge neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0unknown2005-02-041-0/+2
|\
| * type_float.result.es updatedunknown2005-02-041-0/+1
| * Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-02-031-0/+1
* | Merged "query cache for ndb" to 5.0unknown2005-02-031-0/+2
|\ \ | |/ |/|
| * Merge problem unknown2005-01-141-0/+1
| * Merge bk-internal:/home/bk/mysql-4.1unknown2005-01-052-0/+13
| |\
| * \ Merge bk-internal.mysql.com:/data0/bk/mysql-4.1unknown2004-12-201-0/+2
| |\ \
| * \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-4.1unknown2004-12-171-0/+1
| |\ \ \
* | | | | ndb_opt_defaults.h:unknown2005-01-281-0/+1
* | | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-241-0/+1
|\ \ \ \ \
| * | | | | -Added quote_data and needs_quotes (moved from federated handler.unknown2005-01-201-0/+1
* | | | | | Merge with global treeunknown2005-01-181-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-171-0/+1
| |\ \ \ \ \
| | * | | | | Bug #7922 prompt \p fails on Windows for shared-memory connectionsunknown2005-01-151-0/+1
| * | | | | | Fixed memory leak in handle_local_infile()unknown2005-01-171-0/+1
| |/ / / / /
* | | | | | Mergeunknown2005-01-121-0/+1
|\ \ \ \ \ \
| * | | | | | logging_ok:unknown2005-01-121-0/+1
* | | | | | | Merge mysql.com:/space/my/mysql-4.1unknown2005-01-101-0/+235
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | - removed the mysql-test/suites/jp test suite and marked all files as goneunknown2005-01-101-0/+235
| | |_|_|/ | |/| | |
* | | | | mergeunknown2005-01-071-0/+1
|\ \ \ \ \
| * | | | | Fix for compiling error in sql_parseunknown2005-01-061-0/+1
* | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbunknown2005-01-051-0/+1
|\ \ \ \ \ \
| * | | | | | ndb - getTable retry if DICT busyunknown2005-01-051-0/+1
* | | | | | | Mergeunknown2005-01-041-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEYunknown2005-01-031-0/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | set_var.cc:unknown2005-01-021-0/+1
| | * | | | Merged bugfixunknown2004-12-301-0/+1
| | |\ \ \ \
* | | \ \ \ \ Mergeunknown2005-01-031-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge from fix for Bug #7480 Mysqld crash in ha_ndbcluster using Query Browserunknown2005-01-031-0/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Fix for bug #7480 Mysqld crash in ha_ndbcluster using Query Browserunknown2004-12-301-0/+1
* | | | | | | mergeunknown2005-01-011-0/+11
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | manually mergedunknown2004-12-311-0/+11
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | BitKeeper/triggers/pre-deltaunknown2004-12-221-0/+11
| | | |_|_|/ | | |/| | |
* | | | | | Merge mysql.com:/home/jonas/src/mysql-5.0unknown2004-12-311-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-311-0/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0unknown2004-12-311-0/+1
| | |\ \ \ \ \
| | | * | | | | logging_ok:unknown2004-12-241-0/+1
* | | | | | | | mergeunknown2004-12-311-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-311-0/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge with global treeunknown2004-12-311-0/+4
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge with 4.1unknown2004-12-221-0/+4
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| / / / / | | | | |/ / / /
| | | | * | | | fill_help_tables.sh:unknown2004-12-181-0/+1
| | | | * | | | my-innodb-heavy-4G.cnf.sh:unknown2004-12-171-0/+1
| | | | | |/ / | | | | |/| |
| | | | * | | mergeunknown2004-12-171-0/+5
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
| | | | | * | Add (optional) endian parameter to 'get nodeid' to warn on endian conflicts.unknown2004-12-061-0/+1
| | * | | | | Merge from 4.1: fix for bug #7285 (embedded server)unknown2004-12-301-0/+1
| | |/ / / /
* | | | | | ndb - run full mysql-test-run in autotestunknown2004-12-221-0/+1
* | | | | | Changes in config for generation of NDB API docs: unknown2004-12-211-0/+1
* | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbunknown2004-12-201-0/+1
|\ \ \ \ \ \
| * | | | | | logging_ok:unknown2004-12-201-0/+1