summaryrefslogtreecommitdiff
path: root/libmysql
Commit message (Expand)AuthorAgeFilesLines
* Fixes to merge between 5.1-main and 5.1-marvelunknown2007-10-161-1/+1
* Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1unknown2007-10-111-1/+1
* Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2007-09-261-1/+0
|\
| * Makefile.am:unknown2007-09-261-1/+0
| * Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-buildunknown2007-08-291-2/+1
| |\
* | \ Merge trift2.:/MySQL/M50/push-5.0unknown2007-09-051-1/+0
|\ \ \
| * | | libmysql/libmysql.c : Correct a wrong automerge: Don't duplicate "DBUG_EN...unknown2007-09-051-1/+0
* | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-workunknown2007-09-041-3/+4
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.48unknown2007-09-041-1/+3
| |\ \ | | |/ | |/|
| | * build fix for aix and othersunknown2007-08-281-3/+3
| * | CMakeLists.txt:unknown2007-08-291-2/+1
| |/
* | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2007-08-241-1/+9
|\ \
| * \ Merge olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug30396unknown2007-08-161-1/+9
| |\ \ | | |/
| | * Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-08-141-1/+9
| | |\
| | | * Bug#29948: Unchecked NULL pointer caused server crash.unknown2007-08-141-1/+9
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvelunknown2007-08-161-12/+13
|\ \ \ \
| * | | | CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:unknown2007-08-061-12/+13
| |/ / /
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-08-142-38/+41
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed a lot of compiler warnings and errors detected by Forte C++ on Solarisunknown2007-08-132-38/+41
* | | | Post Merge Fixup.unknown2007-08-041-14/+14
* | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2007-08-041-14/+41
|\ \ \ \
| * \ \ \ Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-newunknown2007-08-031-14/+42
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | CMakeLists.txt, README, configure.jsunknown2007-08-031-14/+42
| | * | | CMakeLists.txt (several), make_win_bin_dist:unknown2007-08-021-16/+43
| | | |/ | | |/|
* | | | merge fixunknown2007-08-031-1/+2
* | | | Merge bk-internal:/home/bk/mysql-5.1-marvelunknown2007-08-032-2/+2
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Fixes Bug#30127: --debug-info no longer prints memory usage in mysqlunknown2007-08-011-1/+1
| * | Slow query log to file now displays queries with microsecond precissionunknown2007-07-302-2/+2
* | | Re-apply fixes originally made by Kent, unknown2007-08-031-13/+43
* | | Fix a bad BitKeeper dependency structure for the "CMakeLists.txt" files.unknown2007-07-311-0/+0
|/ /
* | Merge mysql.com:/home/hf/work/29687/my50-29687unknown2007-07-191-1/+1
|\ \ | |/
| * Bug #29687 mysql_stmt_store_result memory leak in libmysqldunknown2007-07-161-1/+1
* | Merge labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marvelunknown2007-07-061-0/+15
|\ \ | |/
| * Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-07-061-0/+15
| |\
| | * Allow multiple calls to mysql_server_end()unknown2007-06-201-0/+15
* | | Merge gleb.loc:/home/uchum/work/bk/5.0-optunknown2007-06-241-11/+16
|\ \ \ | |/ /
| * | Bug #27383: Crash in test "mysql_client_test"unknown2007-06-221-11/+16
| |/
| * Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50unknown2007-05-301-0/+4
| |\
| | * bug#28358 libmysql.dll cannot be dynamically loaded on Windowsunknown2007-05-141-0/+4
| * | Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664unknown2007-05-241-4/+2
| |\ \ | | |/ | |/|
| * | Bug#24732 Executables do not include Vista manifestsunknown2007-04-231-0/+5
* | | Embedded Server doesn't build on Windows.unknown2007-06-151-1/+1
* | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51unknown2007-06-053-8/+8
|\ \ \
| * | | WL#3817: Simplify string / memory area types and make things more consistent ...unknown2007-05-103-8/+8
* | | | Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664unknown2007-05-241-4/+2
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Bug#26664 test suite times out on OS X 64bitunknown2007-05-241-4/+2
| |/
| * Merge siva.hindu.god:/home/tsmith/m/bk/maint/mar05/50unknown2007-03-061-1/+1
| |\
| * | Fixed compiler warnings (for linux and win32 and win64)unknown2007-02-221-1/+0
* | | Bug#24732 Executables do not include Vista manifestsunknown2007-04-231-0/+6
* | | Merge siva.hindu.god:/home/tsmith/m/bk/51unknown2007-04-183-3/+6
|\ \ \