summaryrefslogtreecommitdiff
path: root/libmysql
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2007-01-271-121/+129
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-221-121/+129
| |\
| | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2006-12-151-121/+129
| | |\
| | | * Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-151-121/+129
* | | | Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50tsmith@siva.hindu.god2007-01-181-3/+11
|\ \ \ \ | |/ / /
| * | | Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518msvensson@neptunus.(none)2007-01-161-3/+11
| |\ \ \
| | * | | Bug#15518 Reusing a stmt that has failed during prepare does not clear errormsvensson@neptunus.(none)2007-01-161-3/+11
* | | | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-311-0/+15
* | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-312-1/+4
|\ \ \ \ \ | |/ / / /
| * | | | my_strtoll10-x86.s:kent@mysql.com/kent-amd64.(none)2006-12-313-1/+19
* | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-231-2/+1
|\ \ \ \ \ | |/ / / /
| * | | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-231-2/+1
| | |/ / | |/| |
| * | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marveldf@kahlann.erinye.com2006-12-011-3/+7
| |\ \ \ | | | |/ | | |/|
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-11-293-17/+12
| |\ \ \ | | | |/ | | |/|
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@narttu.mysql.fi2006-11-301-3/+8
|\ \ \ \
| * \ \ \ Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2006-11-301-2/+7
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fixed compiler warningsmonty@mysql.com/narttu.mysql.fi2006-11-301-3/+7
| | | |/ | | |/|
| | * | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@mysql.com/kent-amd64.(none)2006-11-271-2/+2
| | |\ \
| | * \ \ Merge bk-internal:/home/bk/mysql-5.0gkodinov@dl145s.mysql.com2006-11-272-7/+10
| | |\ \ \
| * | | | | Fixed compiler warnings (Mostly VC++):monty@mysql.com/narttu.mysql.fi2006-11-301-1/+1
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2006-11-292-10/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1kent@kent-amd64.(none)2006-11-291-2/+2
| |\ \ \ \ \
| | * \ \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1kent@kent-amd64.(none)2006-11-281-2/+2
| | |\ \ \ \ \
| | | * \ \ \ \ Merge mysql.com:/home/kent/bk/mysql-5.0kent@kent-amd64.(none)2006-11-271-2/+2
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | * | | | ha_innodb.m4, Makefile.am, ha_ndbcluster.m4, Makefile.shared, ha_berkeley.m4:kent@mysql.com/kent-amd64.(none)2006-11-271-2/+2
| * | | | | | | Merge bk-internal:/home/bk/mysql-5.1gkodinov@dl145s.mysql.com2006-11-281-8/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Merge mysql.com:/home/hf/work/w3475/my50-w3475holyfoot/hf@deer.(none)2006-10-241-8/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | / / / | | | | |/ / / | | | |/| | |
| | | * | | | Merge mysql.com:/home/hf/work/w3475/my41-w3475holyfoot/hf@mysql.com/deer.(none)2006-10-231-8/+0
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | WL#3475 (Threads for the embedded server in mysqltest)holyfoot/hf@mysql.com/deer.(none)2006-10-231-7/+0
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2006-11-292-10/+12
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge mysql.com:/home/my/mysql-5.0monty@nosik.monty.fi2006-11-271-0/+3
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Added some missing DBUG_RETURNmonty@mysql.com/nosik.monty.fi2006-11-231-0/+3
| * | | | | | Merge mysql.com:/home/my/mysql-5.0monty@nosik.monty.fi2006-11-221-7/+7
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Remove compiler warningsmonty@mysql.com/nosik.monty.fi2006-11-201-7/+7
| | | |/ / / | | |/| | |
| * | | | | Added --debug-info to most clients to detect memory leaks in mysql-test-runmonty@mysql.com/nosik.monty.fi2006-11-211-3/+2
| | |/ / / | |/| | |
* | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23383kroki/tomash@moonlight.intranet2006-11-171-6/+10
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23383kroki/tomash@moonlight.intranet2006-11-171-6/+10
| |\ \ \ | | |/ / | |/| |
| | * | BUG#23383: mysql_affected_rows() returns different values thankroki/tomash@moonlight.intranet2006-11-171-5/+9
| | |/
* | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50tsmith@maint2.mysql.com2006-09-131-285/+138
|\ \ \ | |/ /
| * | make dist changes for Cmake buildgeorg@lmy002.wdf.sap.corp2006-09-012-1/+176
| * | Additional files for cmake supportgeorg@lmy002.wdf.sap.corp2006-08-311-0/+54
* | | Fix for bug #20907georg@lmy002.wdf.sap.corp2006-08-301-1/+1
* | | Merge bodhi.local:/opt/local/work/tmp_mergekostja@bodhi.local2006-08-121-7/+9
|\ \ \ | |/ /
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-08-021-7/+9
| |\ \
| | * | A fix and a test case for Bug#15752 "Lost connection to MySQL server kostja@bodhi.local2006-07-241-7/+9
* | | | Merge rama.(none):/home/jimw/my/tmp_mergejimw@rama.(none)2006-07-281-8/+9
|\ \ \ \ | |/ / /
| * | | mergingholyfoot/hf@mysql.com/deer.(none)2006-07-181-2/+3
| * | | Merge mysql.com:/home/hf/work/mysql-4.1.mrgholyfoot/hf@mysql.com/deer.(none)2006-07-181-6/+6
| |\ \ \ | | |/ / | |/| / | | |/
| | * Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/deer.(none)2006-07-131-6/+7
| | |\
| | | * bug #16017 (memory leaks in embedded server)holyfoot@deer.(none)2006-06-011-6/+7