summaryrefslogtreecommitdiff
path: root/BitKeeper
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/ / / /
* | | | | | ndb - run full mysql-test-run in autotestjoreland@bk-internal.mysql.com2004-12-221-0/+1
* | | | | | Changes in config for generation of NDB API docs: jon@gigan.2004-12-211-0/+1
* | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbmarty@shark.2004-12-201-0/+1
|\ \ \ \ \ \
| * | | | | | logging_ok:marty@shark.2004-12-201-0/+1
* | | | | | | mergejoreland@mysql.com2004-12-181-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0joreland@mysql.com2004-12-181-0/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Forward port of HugeTLB, InnoDB doublewrite and checksums patches to 5.0kaa@polly.local2004-12-141-0/+1
* | | | | | mergejoreland@mysql.com2004-12-161-0/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge mysql.com:/home/jonas/src/mysql-4.1-fixjoreland@mysql.com2004-12-061-0/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge mysql.com:/home/jonas/src/mysql-4.1joreland@mysql.com2004-11-151-0/+1
| |\ \ \ \ \ \
| * | | | | | | Merge joreland@bk-internal.mysql.com:wl1744 into w2k.:C:/mysql-4.1Administrator@w2k.2004-11-101-0/+1
* | | | | | | | Merge mysql.com:/home/jonas/src/mysql-5.0joreland@mysql.com2004-12-161-0/+1
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0joreland@mysql.com2004-12-161-0/+1
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | WL#1051, more maintanable error messages.anjuta@arthur.local2004-12-131-0/+1
* | | | | | | | don't compile instance-manager by default, as it never compilesndbdev@shark.2004-12-151-0/+1
|/ / / / / / /