summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1unknown2007-08-0422-100/+355
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2007-08-041-1/+1
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-newunknown2007-08-031-1/+1
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | | * | | | | | | CMakeLists.txt, README, configure.jsunknown2007-08-031-2/+1
| | | * | | | | | | CMakeLists.txt (several), make_win_bin_dist:unknown2007-08-021-9/+5
| | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-07-212-2/+7
| | | |\ \ \ \ \ \
| * | | \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.1-marvelunknown2007-08-0321-91/+341
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | / / | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Set --debug-check if one uses DBUG_PUSH in all clientsunknown2007-08-021-3/+3
| | * | | | | | | Fixes Bug#30127: --debug-info no longer prints memory usage in mysqlunknown2007-08-014-41/+58
| | * | | | | | | Slow query log to file now displays queries with microsecond precissionunknown2007-07-3019-66/+298
| | * | | | | | | Added support for 'internal temporary tables' in HEAP tables.unknown2007-07-251-9/+10
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Re-apply fixes originally made by Kent, unknown2007-08-031-8/+13
| * | | | | | | Fix a bad BitKeeper dependency structure for the "CMakeLists.txt" files.unknown2007-07-311-0/+0
| |/ / / / / /
* | | | | | | Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875unknown2007-08-031-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Bug#28875 Conversion between ASCII and LATIN1 charsets does not functionunknown2007-08-031-0/+3
* | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-07-211-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge trift-lap.none:/MySQL/M50/bug14151-5.0unknown2007-07-191-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Avoid the name conflict between the system-provided "md5.h" and the MySQL oneunknown2007-07-191-1/+1
* | | | | | | Merge magare.gmz:/home/kgeorge/mysql/work/B29325-my_errno-5.0-optunknown2007-07-181-0/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Bug #29325: create table overwrites .MYD file of other unknown2007-07-181-0/+2