summaryrefslogtreecommitdiff
path: root/libmysql
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/gluh/MySQL/Merge/5.1gluh@eagle.(none)2007-10-101-0/+2
|\
| * Merge sunlight.local:/local_work/27216-bug-5.0-opt-mysqlevgen@sunlight.local2007-09-241-0/+2
| |\
| | * Bug#27216: functions with parameters of different date types may return wrongevgen@sunlight.local2007-09-221-0/+2
* | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-buildkent@kent-amd64.(none)2007-09-261-1/+0
|\ \ \
| * | | Makefile.am:kent@mysql.com/kent-amd64.(none)2007-09-261-1/+0
| * | | Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-buildkent@kent-amd64.(none)2007-08-291-2/+1
| |\ \ \ | | |/ / | |/| |
* | | | Merge trift2.:/MySQL/M50/push-5.0joerg@trift2.2007-09-051-1/+0
|\ \ \ \
| * | | | libmysql/libmysql.c : Correct a wrong automerge: Don't duplicate "DBUG_EN...joerg@trift2.2007-09-051-1/+0
* | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-workdf@pippilotta.erinye.com2007-09-041-3/+4
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.48df@pippilotta.erinye.com2007-09-041-1/+3
| |\ \ \ | | |/ / | |/| |
| | * | build fix for aix and othersdf@pippilotta.erinye.com2007-08-281-3/+3
| | |/
| * | CMakeLists.txt:kent@mysql.com/kent-amd64.(none)2007-08-291-2/+1
| |/
* | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-builddf@pippilotta.erinye.com2007-08-241-1/+9
|\ \
| * \ Merge olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug30396igor@olga.mysql.com2007-08-161-1/+9
| |\ \ | | |/
| | * Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2007-08-141-1/+9
| | |\
| | | * Bug#29948: Unchecked NULL pointer caused server crash.evgen@moonbone.local2007-08-141-1/+9
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marveljbruehe/mysqldev@mysql.com/production.mysql.com2007-08-161-12/+13
|\ \ \ \
| * | | | CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:kent@mysql.com/kent-amd64.(none)2007-08-061-12/+13
| |/ / /
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@narttu.mysql.fi2007-08-142-38/+41
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed a lot of compiler warnings and errors detected by Forte C++ on Solarismonty@mysql.com/nosik.monty.fi2007-08-132-38/+41
* | | | Post Merge Fixup.iggy@amd64.(none)2007-08-041-14/+14
* | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-builddf@pippilotta.erinye.com2007-08-041-14/+41
|\ \ \ \
| * \ \ \ Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-newkent@kent-amd64.(none)2007-08-031-14/+42
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | CMakeLists.txt, README, configure.jskent@mysql.com/kent-amd64.(none)2007-08-031-14/+42
| | * | | CMakeLists.txt (several), make_win_bin_dist:kent@mysql.com/kent-amd64.(none)2007-08-021-16/+43
| | | |/ | | |/|
* | | | merge fixdf@pippilotta.erinye.com2007-08-031-1/+2
* | | | Merge bk-internal:/home/bk/mysql-5.1-marveldf@pippilotta.erinye.com2007-08-032-2/+2
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Fixes Bug#30127: --debug-info no longer prints memory usage in mysqlmonty@mysql.com/nosik.monty.fi2007-08-011-1/+1
| * | Slow query log to file now displays queries with microsecond precissionmonty@mysql.com/nosik.monty.fi2007-07-302-2/+2
* | | Re-apply fixes originally made by Kent, joerg@trift2.2007-08-031-13/+43
* | | Fix a bad BitKeeper dependency structure for the "CMakeLists.txt" files.joerg@trift2.2007-07-311-0/+0
|/ /
* | Merge mysql.com:/home/hf/work/29687/my50-29687holyfoot/hf@hfmain.(none)2007-07-191-1/+1
|\ \ | |/
| * Bug #29687 mysql_stmt_store_result memory leak in libmysqldholyfoot/hf@mysql.com/hfmain.(none)2007-07-161-1/+1
* | Merge labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marveljani@labbari.dsl.inet.fi2007-07-061-0/+15
|\ \ | |/
| * Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0jani@labbari.dsl.inet.fi2007-07-061-0/+15
| |\
| | * Allow multiple calls to mysql_server_end()monty@mysql.com/narttu.mysql.fi2007-06-201-0/+15
* | | Merge gleb.loc:/home/uchum/work/bk/5.0-optgshchepa/uchum@gleb.loc2007-06-241-11/+16
|\ \ \ | |/ /
| * | Bug #27383: Crash in test "mysql_client_test"gkodinov/kgeorge@magare.gmz2007-06-221-11/+16
| |/
| * Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50tsmith@quadxeon.mysql.com2007-05-301-0/+4
| |\
| | * bug#28358 libmysql.dll cannot be dynamically loaded on Windowsdf@pippilotta.erinye.com2007-05-141-0/+4
| * | Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664msvensson@pilot.blaudden2007-05-241-4/+2
| |\ \ | | |/ | |/|
| * | Bug#24732 Executables do not include Vista manifestsiggy@recycle.(none)2007-04-231-0/+5
* | | Embedded Server doesn't build on Windows.iggy@alf.2007-06-151-1/+1
* | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51tsmith@quadxeon.mysql.com2007-06-053-8/+8
|\ \ \
| * | | WL#3817: Simplify string / memory area types and make things more consistent ...monty@mysql.com/narttu.mysql.fi2007-05-103-8/+8
* | | | Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664msvensson@pilot.blaudden2007-05-241-4/+2
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Bug#26664 test suite times out on OS X 64bitmsvensson@pilot.blaudden2007-05-241-4/+2
| |/
| * Merge siva.hindu.god:/home/tsmith/m/bk/maint/mar05/50tsmith@siva.hindu.god2007-03-061-1/+1
| |\
| * | Fixed compiler warnings (for linux and win32 and win64)monty@mysql.com/narttu.mysql.fi2007-02-221-1/+0
* | | Bug#24732 Executables do not include Vista manifestsiggy@recycle.(none)2007-04-231-0/+6