summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | Merge bk@192.168.21.1:mysql-5.1-optholyfoot/hf@hfmain.(none)2007-11-201-1/+0
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Bug #31868 mysql_server_init crash when language path is not correctly set.holyfoot/hf@mysql.com/hfmain.(none)2007-11-131-1/+0
| | | | |/ / /
| * | | | | | Fix broken embedded build (broken by the patch for Bug#12713, first part).kostja@bodhi.(none)2007-12-133-1/+4
| * | | | | | Bug#12713 "Error in a stored function called from a SELECT doesn't kostja@bodhi.(none)2007-12-122-33/+59
| |/ / / / /
* | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmergecmiller@zippy.cornsilk.net2007-12-142-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge mysql.com:/Users/davi/mysql/bugs/29592-5.0davi@endora.local2007-11-261-1/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| | * | | Bug#29592 SQL Injection issuedavi@mysql.com/endora.local2007-11-261-1/+0
| | | |/ | | |/|
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesistruewing@stella.local2007-11-131-0/+1
| |\ \ \
| | * | | Bug#31210 - INSERT DELAYED crashes server when used onistruewing@stella.local2007-11-121-0/+1
| * | | | Merge mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-mainmattiasj@mattiasj-laptop.(none)2007-11-121-0/+1
| |\ \ \ \ | | |/ / /
| | * | | Bug#31210 - INSERT DELAYED crashes server when used onistruewing@stella.local2007-11-111-0/+1
| | | |/ | | |/|
* | | | Add profiling support for embedded server.cmiller@zippy.cornsilk.net2007-12-141-0/+7
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-communitycmiller@zippy.cornsilk.net2007-11-091-14/+8
|\ \ \ \ | |/ / /
| * | | Cleanup: use helper functions to set an error in MYSQL or MYSQL_STMT.kostja@bodhi.(none)2007-10-311-14/+8
| |/ /
* | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-recentcommmergecmiller@zippy.cornsilk.net2007-10-291-1/+1
|\ \ \ | |/ /
| * | Fixed packet length for embedded testsmalff@lambda.hsd1.co.comcast.net.2007-10-091-1/+1
* | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unificationcmiller@zippy.cornsilk.net2007-10-178-113/+248
|\ \ \ | |/ /
| * | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-buildkent@kent-amd64.(none)2007-09-262-6/+7
| |\ \
| | * | Makefile.am:kent@mysql.com/kent-amd64.(none)2007-09-262-6/+7
| * | | Bug #30389: connection_id() always return 0 in embedded servertsmith@ramayana.hindu.god2007-08-271-0/+11
| |/ /
| * | Merge bk-internal:/home/bk/mysql-5.1-marveljbruehe/mysqldev@mysql.com/production.mysql.com2007-08-162-101/+140
| |\ \
| | * | CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:kent@mysql.com/kent-amd64.(none)2007-08-062-101/+140
| * | | Fixed errors found by pushbuild:monty@mysql.com/narttu.mysql.fi2007-08-161-1/+1
| |/ /
| * | Merge amd64.(none):/src/mysql-5.1-maintiggy@amd64.(none)2007-08-033-12/+65
| |\ \
| | * | Bug#29903 The CMake build method does not produce the embedded library.iggy@amd64.(none)2007-08-031-3/+5
| | * | Bug#29903 The CMake build method does not produce the embedded library.iggy@amd64.(none)2007-08-034-10/+62
| * | | Makefile.am:kent@mysql.com/kent-amd64.(none)2007-08-024-9/+2
| |/ /
| * | Merge trift2.:/MySQL/M50/push-5.0joerg@trift2.2007-06-181-2/+2
| |\ \ | | |/
| | * Merge trift2.:/MySQL/M41/push-4.1joerg@trift2.2007-06-181-2/+2
| | |\
| | | * libmysqld.def:kent@mysql.com/c-554072d5.010-2112-6f72651.cust.bredbandsbolaget.se2007-06-121-2/+2
| | * | Merge trift2.:/MySQL/M41/tmp-4.1joerg@trift2.2007-06-131-1/+1
| | |\ \ | | | |/
| | | * Add a cast, needed by some platforms.joerg@trift2.2007-06-081-1/+1
| | | * Do not use the "thd" pointer to identify a thread in the embedded lib,joerg@trift2.2007-06-071-1/+1
| | | * bug #25492 (Invalid deallocation in mysql_stmt_fetch())holyfoot/hf@mysql.com/hfmain.(none)2007-03-051-14/+8
| | | * bug #25492 (Invalid deallocation in mysql_stmt_fetch)holyfoot/hf@mysql.com/hfmain.(none)2007-02-131-6/+26
| | | * bug #25492 (Invalid deallocation in mysql_stmt_fetch)holyfoot/hf@mysql.com/hfmain.(none)2007-01-291-1/+1
| * | | Embedded Server doesn't build on Windows.iggy@alf.2007-06-153-45/+81
| * | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-05-243-25/+25
| |\ \ \
| | * | | WL#3817: Simplify string / memory area types and make things more consistent ...monty@mysql.com/narttu.mysql.fi2007-05-103-25/+25
| * | | | Merge mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.0-ndbmikron@mikael-ronstr-ms-dator.local2007-05-072-1/+3
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fix SCI Transportermikron@mikael-ronstr-ms-dator.local2007-05-072-2/+3
* | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-unified02cmiller@zippy.cornsilk.net2007-05-071-4/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge trift2.:/MySQL/M50/mysql-5.0joerg@trift2.2007-05-021-3/+3
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | Format corrections for various "Makefile.am": Leading tab, no trailing blank.joerg@trift2.2007-05-021-3/+3
| * | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndbmskold/marty@linux.site2007-04-241-1/+4
| |\ \ \
| | * | | ha_ndbcluster.h, ha_ndbcluster.cc:mskold/marty@mysql.com/linux.site2007-04-241-1/+4
* | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-enterprise-former...cmiller@zippy.cornsilk.net2007-04-271-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2007-04-031-0/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge bk-internal:/home/bk/mysql-5.0mjorgensen@production.mysql.com2007-01-121-0/+1
| | |\ \ \
| | | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-communitycmiller@zippy.cornsilk.net2007-01-031-0/+1
| | | |\ \ \