summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Fixed compiler warningsmonty@mysql.com/narttu.mysql.fi2007-02-233-10/+4
| |/ / |/| |
* | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-02-031-0/+1
|\ \ \
| * \ \ Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2007-01-271-0/+1
| |\ \ \ | | |/ / | |/| / | | |/
| | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-221-1/+1
| | |\
| | | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2006-12-151-1/+1
| | | |\
| | | | * Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-151-2/+1
* | | | | BUG#25890 put previous fix in better placedf@kahlann.erinye.com2007-01-271-5/+5
* | | | | BUG#25895 compiling the server with embedded fails on several 64-bit platformsdf@kahlann.erinye.com2007-01-271-1/+1
* | | | | BUG#25890 mysqltest_embedded crashes on startdf@kahlann.erinye.com2007-01-271-0/+5
|/ / / /
* | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2007-01-171-2/+1
|\ \ \ \
| * \ \ \ Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2007-01-121-2/+1
| |\ \ \ \
| | * \ \ \ Merge mysql.com:/home/bkroot/mysql-5.1-new-rpllars@black.(none)2006-12-081-2/+1
| | |\ \ \ \
| | | * | | | WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.cbell/Chuck@suse.vabb.com2006-12-071-2/+1
* | | | | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimemalff/marcsql@weblab.(none)2007-01-121-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Bug#22687 (Functions UNIQUE_USERS, GROUP_UNIQUE_USERS)malff/marcsql@weblab.(none)2007-01-111-1/+1
| |/ / / / /
* | | | | | Merge mysql.com:/d2/hf/common/my50-commonholyfoot/hf@hfmain.(none)2007-01-031-0/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge mysql.com:/d2/hf/common/my41-commonholyfoot/hf@mysql.com/hfmain.(none)2007-01-031-0/+1
| |\ \ \ \ \
| | * | | | | warning count for embedded prepared statements addedholyfoot/hf@mysql.com/hfmain.(none)2007-01-031-0/+1
| | * | | | | merging fixholyfoot/hf@mysql.com/hfmain.(none)2007-01-021-2/+0
* | | | | | | Merge mysql.com:/d2/hf/common/my50-commonholyfoot/hf@hfmain.(none)2007-01-021-0/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge mysql.com:/d2/hf/common/my41-commonholyfoot/hf@mysql.com/hfmain.(none)2007-01-021-0/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | merging fixholyfoot/hf@mysql.com/hfmain.(none)2007-01-021-4/+4
| | * | | | | embedded-server related fixesholyfoot/hf@mysql.com/hfmain.(none)2007-01-021-0/+6
| | * | | | | Merge bk@192.168.21.1:mysql-4.1-optholyfoot/hf@mysql.com/deer.(none)2006-12-082-1/+5
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1kostja@bodhi.local2006-11-291-5/+9
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com/kent-amd64.(none)2006-11-271-5/+19
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge mysql.com:/d2/hf/clean/my50-cleanholyfoot/hf@mysql.com/hfmain.(none)2006-12-312-1/+7
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.0-optholyfoot/hf@mysql.com/deer.(none)2006-12-082-1/+7
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
* | | | | | | | | | | Merge mysql.com:/d2/hf/clean/my51-cleanholyfoot/hf@hfmain.(none)2006-12-313-5/+33
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | WL#3630 (add embedded server to pushbuild)holyfoot/hf@mysql.com/hfmain.(none)2006-12-282-4/+26
| * | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.1-optholyfoot/hf@deer.(none)2006-12-082-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge mysql.com:/home/hf/work/embt/my50-embtholyfoot/hf@deer.(none)2006-11-132-1/+7
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | several fixes to make tests pass in embedded-server modeholyfoot/hf@mysql.com/deer.(none)2006-11-131-0/+2
| | | * | | | | | | | | Merge mysql.com:/home/hf/work/embt/my41-embtholyfoot/hf@mysql.com/deer.(none)2006-11-132-1/+5
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / | | | | |/| | | | | | |
View Lorry Controller Status