summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Mechanical class renaming:guilhem@gbichot3.local2007-01-307-69/+69
* Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimemalff/marcsql@weblab.(none)2007-01-299-368/+404
|\
| * Fix for bug#22740 Events: Decouple Event_queue from Event_db_repositorykroki/tomash@moonlight.home2007-01-299-368/+404
* | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimemalff/marcsql@weblab.(none)2007-01-297-23/+63
|\ \ | |/ |/|
| * Bug#24392 (SHOW ENGINE MUTEX STATUS is a synonym for SHOW INNODB STATUS)malff/marcsql@weblab.(none)2007-01-237-23/+63
* | Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1kroki/tomash@moonlight.home2007-01-251-1/+17
|\ \
| * \ Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0-bug23527kroki/tomash@moonlight.home2007-01-251-1/+17
| |\ \
| | * | BUG#23527: set global query_cache_size can crash the server underkroki/tomash@moonlight.home2007-01-251-1/+17
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1dlenev@mockturtle.local2007-01-252-2/+2
|\ \ \ \
| * | | | Raise version number after cloning 5.1.15-betadfischer/mysqldev@mysql.com/production.mysql.com2007-01-251-1/+1
| * | | | SETUP.sh:jani/jamppa@bk-internal.mysql.com2007-01-251-1/+1
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marveldlenev@mockturtle.local2007-01-2563-262/+311
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new-ndbjani/jamppa@bk-internal.mysql.com2007-01-2561-261/+293
| |\ \ \
| | * \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.1jani/jamppa@bk-internal.mysql.com2007-01-2561-261/+293
| | |\ \ \
| | | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvelmonty@hasky.mysql.fi2007-01-230-0/+0
| | | |\ \ \
| | | | * \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.1jani/jamppa@bk-internal.mysql.com2007-01-110-0/+0
| | | | |\ \ \
| | | | | * \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.1jani/jamppa@bk-internal.mysql.com2007-01-090-0/+0
| | | | | |\ \ \
| | | | | | * \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.1jani/jamppa@bk-internal.mysql.com2006-12-1816-87/+161
| | | | | | |\ \ \
| | | | | | * \ \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.1jani/jamppa@bk-internal.mysql.com2006-12-08214-1324/+4496
| | | | | | |\ \ \ \
| | | | | | * \ \ \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.1jani/jamppa@bk-internal.mysql.com2006-12-0517-114/+486
| | | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.1jani/jamppa@bk-internal.mysql.com2006-12-040-0/+0
| | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | Type of last argument was changed in .c file, but not in thejani@a88-112-41-254.elisa-laajakaista.fi2006-12-041-1/+1
| | | * | | | | | | | | | Merge monty@192.168.0.9:/home/my/mysql-5.1monty@hasky.mysql.fi2007-01-231-1/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Change to new (after merge) error numbersmonty@mysql.com/narttu.mysql.fi2007-01-2310-31/+31
| | | * | | | | | | | | | | Merge monty@192.168.0.9:/home/my/mysql-5.1monty@hasky.mysql.fi2007-01-220-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge monty@192.168.0.9:/home/my/mysql-5.1monty@hasky.mysql.fi2007-01-2260-251/+282
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / / | | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | | Change to new (after merge) error numbersmonty@mysql.com/narttu.mysql.fi2007-01-229-30/+30
| | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@narttu.mysql.fi2007-01-2260-251/+283
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Give warnings for unused objectsmonty@mysql.com/narttu.mysql.fi2007-01-2260-251/+282
| * | | | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1tomas@poseidon.mysql.com2007-01-252-1/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndbtomas@poseidon.mysql.com2007-01-252-1/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | ndb:tomas@poseidon.mysql.com2007-01-252-1/+18
* | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtimedlenev@mockturtle.local2007-01-2516-87/+162
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1dlenev@mockturtle.local2007-01-2516-87/+162
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-enginessvoj@april.(none)2007-01-250-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/svoj/devel/bk/mysql-5.0svoj@mysql.com/april.(none)2007-01-2513-89/+162
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/svoj/devel/bk/mysql-5.0svoj@mysql.com/april.(none)2007-01-2513-89/+162
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-enginesistruewing@chilla.local2007-01-242-3/+3
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0df@kahlann.erinye.com2007-01-2435-169/+637
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Merge mysql.com:/home/svoj/devel/bk/mysql-5.1svoj@april.(none)2007-01-2516-87/+162
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesistruewing@chilla.local2007-01-242-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | After merge fixistruewing@chilla.local2007-01-241-0/+1
| | | | * | | | | | | | | | | | | | | | | Merge chilla.local:/home/mydev/mysql-5.0-bug24607istruewing@chilla.local2007-01-242-4/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | Bug#24607 - MyISAM pointer size determined incorrectlyistruewing@chilla.local2007-01-241-1/+1
| | | | | * | | | | | | | | | | | | | | | Merge chilla.local:/home/mydev/mysql-4.1-bug24607istruewing@chilla.local2007-01-242-3/+3
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | Bug#24607 - MyISAM pointer size determined incorrectlyistruewing@chilla.local2007-01-242-3/+3
| | | * | | | | | | | | | | | | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-enginessvoj@june.mysql.com2007-01-242-47/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | After merge fix.svoj@mysql.com/june.mysql.com2007-01-242-47/+0
| | | | * | | | | | | | | | | | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-enginessvoj@mysql.com/june.mysql.com2007-01-240-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-enginessvoj@mysql.com/june.mysql.com2007-01-241-0/+7
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | |