summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/hf/work/mrg/my50-mrgholyfoot/hf@hfmain.(none)2007-12-011-0/+2
|\
| * Bug #32624 Error with multi queries in MySQL embedded server 5.1.22.holyfoot/hf@mysql.com/hfmain.(none)2007-11-291-0/+2
* | Merge mysql.com:/home/hf/work/30430/my51-30430holyfoot/hf@hfmain.(none)2007-11-302-36/+71
|\ \
| * | Bug #30430 crash:./mtr --embedded-server --ps-protocol cache_innodb func_misc...holyfoot/hf@mysql.com/hfmain.(none)2007-11-302-36/+71
* | | Merge mysql.com:/home/hf/work/32211/my51-32211holyfoot/hf@hfmain.(none)2007-11-201-1/+1
|\ \ \
| * | | Bug #32211 Test 'windows' and 'windows_shm' failed for embedded serverholyfoot/hf@mysql.com/hfmain.(none)2007-11-181-1/+1
* | | | 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
| |/ /
* | | 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
| |/ /
* | | Cleanup: use helper functions to set an error in MYSQL or MYSQL_STMT.kostja@bodhi.(none)2007-10-311-14/+8
|/ /
* | Fixed packet length for embedded testsmalff@lambda.hsd1.co.comcast.net.2007-10-091-1/+1
* | 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 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 pilot.blaudden:/home/msvensson/mysql/mysql-5.1msvensson@pilot.blaudden2007-04-232-9/+11
|\ \ \ \ | |/ / /
| * | | Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508msvensson@pilot.blaudden2007-04-112-9/+11
| |\ \ \
| | * | | Bug#22508 BUILD/compile-dist fails due to problem with readline/libeditmsvensson@pilot.blaudden2007-03-272-9/+11
* | | | | WL#2735: Refactor replicationmats@romeo.(none)2007-04-131-1/+1
* | | | | BUG#27779 (Slave cannot read old rows log events):mats@romeo.(none)2007-04-121-1/+3
|/ / / /
* | | | manual mergeguilhem@gbichot3.local2007-03-091-6/+6
|\ \ \ \
| * | | | Mechanical class renaming:guilhem@gbichot3.local2007-01-301-6/+6
* | | | | Fixed compilations problems and warnings on windowsmonty@mysql.com/narttu.mysql.fi2007-02-231-1/+1