summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2007-01-121-1/+1
|\
| * Bug#22687 (Functions UNIQUE_USERS, GROUP_UNIQUE_USERS)unknown2007-01-111-1/+1
* | Merge mysql.com:/d2/hf/common/my50-commonunknown2007-01-031-0/+1
|\ \
| * \ Merge mysql.com:/d2/hf/common/my41-commonunknown2007-01-031-0/+1
| |\ \
| | * | warning count for embedded prepared statements addedunknown2007-01-031-0/+1
| | * | merging fixunknown2007-01-021-2/+0
* | | | Merge mysql.com:/d2/hf/common/my50-commonunknown2007-01-021-0/+4
|\ \ \ \ | |/ / /
| * | | Merge mysql.com:/d2/hf/common/my41-commonunknown2007-01-021-0/+4
| |\ \ \ | | |/ /
| | * | merging fixunknown2007-01-021-4/+4
| | * | embedded-server related fixesunknown2007-01-021-0/+6
| | * | Merge bk@192.168.21.1:mysql-4.1-optunknown2006-12-082-1/+5
| | |\ \
| | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-11-291-5/+9
| | |\ \ \
| | * \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-11-271-5/+19
| | |\ \ \ \
| * | \ \ \ \ Merge mysql.com:/d2/hf/clean/my50-cleanunknown2006-12-312-1/+7
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.0-optunknown2006-12-082-1/+7
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ Merge mysql.com:/d2/hf/clean/my51-cleanunknown2006-12-313-5/+33
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | WL#3630 (add embedded server to pushbuild)unknown2006-12-282-4/+26
| * | | | | | | | | Merge bk@192.168.21.1:mysql-5.1-optunknown2006-12-082-1/+7
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Merge mysql.com:/home/hf/work/embt/my50-embtunknown2006-11-132-1/+7
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | several fixes to make tests pass in embedded-server modeunknown2006-11-131-0/+2
| | | * | | | | | | Merge mysql.com:/home/hf/work/embt/my41-embtunknown2006-11-132-1/+5
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | |
| | | | * | | | | | embedded-mode tests fixedunknown2006-11-132-1/+5
| | | | | |_|/ / / | | | | |/| | | |
| | * | | | | | | Merge mysql.com:/home/hf/work/current_stmt/my50-current_stmtunknown2006-10-241-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge mysql.com:/home/hf/work/0current_stmt/my41-current_stmtunknown2006-10-241-1/+1
| | | |\ \ \ \ \ \ | | | | |/ / / / /
* | | | | | | | | Many files:unknown2006-12-312-0/+30
* | | | | | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0unknown2006-12-313-3/+3
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | my_strtoll10-x86.s:unknown2006-12-313-3/+3
* | | | | | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0unknown2006-12-236-12/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Many files:unknown2006-12-236-12/+7
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-11-293-6/+20
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-11-271-5/+18
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0unknown2006-11-271-1/+1
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | Fix after manual merge: remove dead declaration.unknown2006-11-171-1/+0
* | | | | | | | | | | WL# 3031unknown2006-12-011-1/+2
| |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-11-292-7/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Many files:unknown2006-11-291-2/+2
| * | | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-11-291-5/+17
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-11-281-5/+17
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/kent/bk/mysql-5.0unknown2006-11-271-5/+17
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Merge mysql.com:/home/kent/bk/mysql-4.1unknown2006-11-271-5/+18
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|/ / | | | | | |/| | | | | | |
| | | | | * | | | | | | | gen_rec.awk:unknown2006-11-271-5/+19
| * | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.1unknown2006-11-281-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge mysql.com:/home/hf/work/mysql-5.0-mrgunknown2006-11-171-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | / / / / / / | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge mysql.com:/home/hf/work/mysql-4.1-mrgunknown2006-11-161-0/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | / / | | | | | |_|_|_|_|/ / | | | | |/| | | | | |
| | | | * | | | | | | Bug #23427 (incompatible ABI change)unknown2006-10-241-5/+5
| | | | |/ / / / / /
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-11-291-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge mysql.com:/home/my/mysql-5.0unknown2006-11-221-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | / / / / | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Remove compiler warningsunknown2006-11-201-1/+1
| | |/ / / / / /
* | | | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23383unknown2006-11-171-7/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
| * | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23383unknown2006-11-171-7/+9
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | |