summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal:/home/bk/mysql-5.1-enginesunknown2007-08-032-31/+59
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesunknown2007-08-021-1/+8
| |\
| | * Merge mysql.com:/home/svoj/devel/mysql/BUG29152/mysql-5.0-enginesunknown2007-08-021-1/+8
| | |\
| | | * BUG#29152 - INSERT DELAYED does not use concurrent_insert on slaveunknown2007-07-311-1/+8
| * | | Merge chilla.local:/home/mydev/mysql-5.0-bug29838unknown2007-08-011-30/+51
| |\ \ \ | | |/ / | |/| |
| | * | Merge chilla.local:/home/mydev/mysql-4.1-bug29838unknown2007-08-011-30/+51
| | |\ \ | | | |/ | | |/|
| | | * Bug#29838 - myisam corruption using concurrent select ... and updateunknown2007-08-011-30/+51
| * | | Merge chilla.local:/home/mydev/mysql-5.0-axmrgunknown2007-07-280-0/+0
| |\ \ \ | | |/ /
| | * | Merge chilla.local:/home/mydev/mysql-5.0-ateamunknown2007-07-281-128/+128
| | |\ \
| | | * | Backported mi_test_all.sh from 5.1.unknown2007-07-281-128/+128
* | | | | add mysqlslap back to windows builds for 5.1unknown2007-08-031-0/+4
* | | | | powermacg5 problem fixunknown2007-08-031-3/+7
* | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2007-08-035-128/+87
|\ \ \ \ \
| * | | | | Re-apply fixes originally made by Kent, unknown2007-08-035-128/+87
* | | | | | README.txt-1:unknown2007-08-030-0/+0
|/ / / / /
* | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2007-08-0318-935/+1643
|\ \ \ \ \
| * | | | | WL#3732 Information schema optimizationunknown2007-08-0318-935/+1643
* | | | | | Merge trift2.:/MySQL/M50/push-5.0unknown2007-08-020-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge trift2.:/MySQL/M41/push-4.1unknown2007-08-020-0/+0
| |\ \ \ \ \
| | * \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1-buildunknown2007-08-021-2/+2
| | |\ \ \ \ \
* | | | | | | | Limit stack size of the server to 1 MB.unknown2007-08-021-0/+3
* | | | | | | | Merge trift2.:/MySQL/M50/push-5.0unknown2007-08-020-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-buildunknown2007-08-029-188/+110
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge trift2.:/MySQL/M50/push-5.0unknown2007-08-020-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge trift2.:/MySQL/M50/mysql-5.0unknown2007-08-020-0/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-08-024-2/+15
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2007-08-0210-103/+68
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-buildunknown2007-08-022-77/+54
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | make_win_bin_dist:unknown2007-08-021-53/+28
| | * | | | | | | | | | Merge production.mysql.com:/usersnfs/jperkin/bk/trees/build/mysql-4.1unknown2007-08-021-2/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-4.1-buildunknown2007-08-021-2/+2
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | myisamchk.c:unknown2007-08-021-2/+2
| | * | | | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-buildunknown2007-08-028-133/+80
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Makefile.am:unknown2007-08-0210-145/+88
| * | | | | | | | | | | | Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-buildunknown2007-08-021-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | CMakeLists.txt (several), make_win_bin_dist:unknown2007-08-028-132/+79
* | | | | | | | | | | | | Merge trift2.:/MySQL/M51/bug29982-5.1unknown2007-08-0219-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix a bad BitKeeper dependency structure for the "CMakeLists.txt" files.unknown2007-07-3119-0/+0
* | | | | | | | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maintunknown2007-08-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge trift2.:/MySQL/M50/push-5.0unknown2007-08-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge trift2.:/MySQL/M50/mysql-5.0unknown2007-08-0224-173/+719
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1unknown2007-08-02156-8506/+2610
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | After-merge fix: result adjusted.unknown2007-08-021-0/+3
* | | | | | | | | | | | | | | | Merge mysql.com:/home/ram/work/b30088/b30088.5.0unknown2007-08-023-2/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix for bug #30088: Can't disable myisam-recover by a value of "".unknown2007-08-014-2/+15
* | | | | | | | | | | | | | | | Merge mysql.com:/home/ram/work/b30200/b30200.5.0unknown2007-08-022-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-p...unknown2007-08-023-1/+2
* | | | | | | | | | | | | | | | Post-merge fix. Update some test results, and add an InnoDB-onlyunknown2007-08-025-22/+24
* | | | | | | | | | | | | | | | Merge 50 -> 51 (-opt changesets)unknown2007-08-0111-33/+303
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41unknown2007-08-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | |