summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmergeunknown2007-12-142-1/+2
|\
| * Merge mysql.com:/Users/davi/mysql/bugs/29592-5.0unknown2007-11-261-1/+0
| |\
| | * Bug#29592 SQL Injection issueunknown2007-11-261-1/+0
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesunknown2007-11-131-0/+1
| |\ \
| | * | Bug#31210 - INSERT DELAYED crashes server when used onunknown2007-11-121-0/+1
| * | | Merge mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-mainunknown2007-11-121-0/+1
| |\ \ \ | | |/ /
| | * | Bug#31210 - INSERT DELAYED crashes server when used onunknown2007-11-111-0/+1
* | | | Add profiling support for embedded server.unknown2007-12-141-0/+7
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-communityunknown2007-11-091-14/+8
|\ \ \ \ | |/ / /
| * | | Cleanup: use helper functions to set an error in MYSQL or MYSQL_STMT.unknown2007-10-311-14/+8
| |/ /
* | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-recentcommmergeunknown2007-10-291-1/+1
|\ \ \ | |/ /
| * | Fixed packet length for embedded testsunknown2007-10-091-1/+1
* | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unificationunknown2007-10-178-113/+248
|\ \ \ | |/ /
| * | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2007-09-262-6/+7
| |\ \
| | * | Makefile.am:unknown2007-09-262-6/+7
| * | | Bug #30389: connection_id() always return 0 in embedded serverunknown2007-08-271-0/+11
| |/ /
| * | Merge bk-internal:/home/bk/mysql-5.1-marvelunknown2007-08-162-101/+140
| |\ \
| | * | CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:unknown2007-08-062-101/+140
| * | | Fixed errors found by pushbuild:unknown2007-08-161-1/+1
| |/ /
| * | Merge amd64.(none):/src/mysql-5.1-maintunknown2007-08-033-12/+65
| |\ \
| | * | Bug#29903 The CMake build method does not produce the embedded library.unknown2007-08-031-3/+5
| | * | Bug#29903 The CMake build method does not produce the embedded library.unknown2007-08-034-10/+62
| * | | Makefile.am:unknown2007-08-024-9/+2
| |/ /
| * | Merge trift2.:/MySQL/M50/push-5.0unknown2007-06-181-2/+2
| |\ \ | | |/
| | * Merge trift2.:/MySQL/M41/push-4.1unknown2007-06-181-2/+2
| | |\
| | | * libmysqld.def:unknown2007-06-121-2/+2
| | * | Merge trift2.:/MySQL/M41/tmp-4.1unknown2007-06-131-1/+1
| | |\ \ | | | |/
| | | * Add a cast, needed by some platforms.unknown2007-06-081-1/+1
| | | * Do not use the "thd" pointer to identify a thread in the embedded lib,unknown2007-06-071-1/+1
| | | * bug #25492 (Invalid deallocation in mysql_stmt_fetch())unknown2007-03-051-14/+8
| | | * bug #25492 (Invalid deallocation in mysql_stmt_fetch)unknown2007-02-131-6/+26
| | | * bug #25492 (Invalid deallocation in mysql_stmt_fetch)unknown2007-01-291-1/+1
| * | | Embedded Server doesn't build on Windows.unknown2007-06-153-45/+81
| * | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-05-243-25/+25
| |\ \ \
| | * | | WL#3817: Simplify string / memory area types and make things more consistent ...unknown2007-05-103-25/+25
| * | | | Merge mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.0-ndbunknown2007-05-072-1/+3
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fix SCI Transporterunknown2007-05-072-2/+3
* | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-unified02unknown2007-05-071-4/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge trift2.:/MySQL/M50/mysql-5.0unknown2007-05-021-3/+3
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | Format corrections for various "Makefile.am": Leading tab, no trailing blank.unknown2007-05-021-3/+3
| * | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndbunknown2007-04-241-1/+4
| |\ \ \
| | * | | ha_ndbcluster.h, ha_ndbcluster.cc:unknown2007-04-241-1/+4
* | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-enterprise-former...unknown2007-04-271-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-04-031-0/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge bk-internal:/home/bk/mysql-5.0unknown2007-01-121-0/+1
| | |\ \ \
| | | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-communityunknown2007-01-031-0/+1
| | | |\ \ \
| | | | * | | Bug#24795: Add SHOW PROFILEunknown2007-01-031-0/+1
* | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1unknown2007-04-232-9/+11
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508unknown2007-04-112-9/+11
| |\ \ \ \ \ \
| | * | | | | | Bug#22508 BUILD/compile-dist fails due to problem with readline/libeditunknown2007-03-272-9/+11