summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-enginesunknown2007-10-191-3/+43
|\
| * Merge stella.local:/home2/mydev/mysql-5.1-amainunknown2007-10-101-3/+43
| |\
| | * Bug#31382unknown2007-10-041-3/+43
* | | Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-baseunknown2007-10-182-1/+17
|\ \ \
| * \ \ Merge ramayana.hindu.god:/home/tsmith/m/bk/51unknown2007-10-102-1/+17
| |\ \ \ | | |/ / | |/| |
| | * | Merge sita.local:/Users/tsmith/m/bk/maint/50unknown2007-10-041-1/+1
| | |\ \
| | | * \ Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731unknown2007-10-041-0/+16
| | | |\ \
| | | * | | Bug#27597 mysqld-debug brokenunknown2007-10-021-1/+1
| | * | | | Merge polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731unknown2007-10-041-0/+16
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731unknown2007-10-041-0/+16
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Issue a warning if a user sets an option or a variable to a value that is gre...unknown2007-10-041-0/+16
| | | | |/
| | | | * Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731_keycacheunknown2007-10-021-12/+13
| | | | |\
| | | | | * Backport of the keycache changes from http://lists.mysql.com/commits/31517 to...unknown2007-08-291-12/+13
| | | | * | Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platf...unknown2007-08-293-28/+27
| | | | |/
* | | | | Merge moksha.local:/Users/davi/mysql/push/mysql-5.0-runtimeunknown2007-10-092-7/+65
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Bug#30992 Wrong implementation of pthread_mutex_trylock()unknown2007-10-031-12/+10
| * | | | Merge kindahl-laptop.dnsalias.net:/home/bk/b30992-mysql-5.0-rplunknown2007-10-012-7/+67
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | BUG#30992 (Wrong implementation of pthread_mutex_trylock()):unknown2007-10-012-7/+67
* | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-...unknown2007-09-271-0/+14
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | avoid using GetTempFileName in a way it's documented to not work on windowsunknown2007-09-271-0/+14
| |/ / /
* | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-08-282-6/+14
|\ \ \ \ | |_|_|/ |/| | |
| * | | Bug #28284: Test "mysqlslap" reports "out of memory"unknown2007-08-242-6/+14
* | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-08-252-8/+10
|\ \ \ \
| * \ \ \ Manual merge of parallel development in separate team trees.unknown2007-08-226-17/+55
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge trift2.:/MySQL/M51/target-5.1.22unknown2007-08-225-11/+50
| | |\ \ \
| | | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvelunknown2007-08-162-8/+10
| | | |\ \ \
| | | | * | | mysys/my_gethwaddr.cunknown2007-08-091-2/+5
| | * | | | | Merge trift2.:/MySQL/M51/mysql-5.1unknown2007-08-211-6/+5
| | |\ \ \ \ \
| | | * \ \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1unknown2007-08-151-8/+32
| | | |\ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:unknown2007-08-061-6/+5
* | | | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-08-225-14/+58
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.0-marvelunknown2007-08-211-5/+13
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Fix for Bug#27970 "Fix for bug 24507 makes mysql_install_db fail"unknown2007-08-161-5/+12
| | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-08-081-8/+32
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0unknown2007-08-051-0/+3
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875unknown2007-08-031-0/+3
| | | |\ \ \ \ \ \
| * | | \ \ \ \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-08-214-9/+45
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-08-144-9/+45
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | * | | | | | Fixed a lot of compiler warnings and errors detected by Forte C++ on Solarisunknown2007-08-134-9/+45
* | | | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-baseunknown2007-08-201-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix doxygen warnings.unknown2007-08-151-1/+1
| |/ / / / / / /
* | | | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/51unknown2007-08-131-8/+32
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-08-081-8/+32
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg21281unknown2007-08-051-8/+32
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Fix for bug #21281 "Pending write lock is incorrectly removed when itsunknown2007-08-051-8/+32
| | | | |_|/ / | | | |/| | |
* | | | | | | Correct bad merge, and remove version numbers from test case.unknown2007-08-081-0/+1
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-08-071-4/+35
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/.deleted/mysql-5.1-new-main...unknown2007-08-021-4/+35
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maintunknown2007-04-231-3/+35
| | |\ \ \ \ \
| | | * | | | | Contributed patch from Jorge Bernal Ordovás. CLA#42unknown2007-04-231-3/+35