summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/kent/bk/main/mysql-5.0unknown2006-12-230-0/+0
|\
| * configure.in : Update of the NDB version number was missing, do it.unknown2006-12-211-1/+1
* | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-archunknown2006-12-220-0/+0
|\ \
| * \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2006-12-2227-40/+244
| |\ \
* | \ \ Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-12-2227-40/+244
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge trift2.:/MySQL/M50/clone-5.0unknown2006-12-215-6/+16
| |\ \
| | * \ Merge trift2.:/MySQL/M50/push-5.0unknown2006-12-201-1/+1
| | |\ \
| | * \ \ Merge mysqldev@production.mysql.com:/data0/mysqldev/my/build-200612151202-5.0...unknown2006-12-201-0/+1
| | |\ \ \
| | * \ \ \ Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-24896unknown2006-12-201-1/+11
| | |\ \ \ \
| | | * | | | BUG#24896 magnus' suggestionunknown2006-12-121-2/+2
| | | * | | | BUG#24896 mysql_upgrade -p fixunknown2006-12-081-1/+11
| | * | | | | Merge dev:my/build-200612151202-5.0.32/mysql-5.0-releaseunknown2006-12-2019-32/+212
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-workunknown2006-12-195-6/+6
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-workunknown2006-12-195-6/+6
| | | |\ \ \ \ \ \
| | | | * | | | | | remove hard-coded socket paths from some testsunknown2006-12-196-16/+16
| | | | * | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-buildunknown2006-12-181-0/+6
| | | | |\ \ \ \ \ \
| | | * | \ \ \ \ \ \ Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-buildunknown2006-12-180-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | Merge trift2.:/MySQL/M41/spec-4.1unknown2006-12-141-0/+7
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1unknown2006-12-146-55/+93
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1unknown2006-12-114-9/+16
| | | | |\ \ \ \ \ \ \ \ \
| * | | | \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M50/push-5.0unknown2006-12-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0unknown2006-12-2033-114/+376
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Raise version number after cloning 5.0.32unknown2006-12-151-1/+1
| * | | | | | | | | | | | | Post-merge fix (related to bug 24200 changes)unknown2006-12-202-2/+5
| * | | | | | | | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/50-buildunknown2006-12-2019-31/+211
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Fix silly typos in the disabling of "im_daemon_life_cycle" (bug#24415).unknown2006-12-201-1/+1
| | * | | | | | | | | | | | Merge trift2.:/MySQL/M50/clone-5.0unknown2006-12-201-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Disable test "im_deamon_life_cycle", Bug#24425, see note: [19 Dec 23:17] Trud...unknown2006-12-201-0/+1
| | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/50-releaseunknown2006-12-193-3/+4
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Remove warnings by castingunknown2006-12-193-3/+4
| | * | | | | | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/50-releaseunknown2006-12-190-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/50-releaseunknown2006-12-1811-81/+151
| | | |\ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/50-24200unknown2006-12-1913-2/+144
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Added innodb_rollback_on_timeout option to restore the 4.1 unknown2006-12-1913-2/+144
| | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Alternative decimal2double implementation using an algorithmunknown2006-12-191-8/+26
| | * | | | | | | | | | | | Bug #24947: REPEAT function returns NULL when passed a field as the count par...unknown2006-12-193-20/+39
| | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge mysql.com:/data0/mysqldev/my/mysql-5.0-releaseunknown2006-12-1911-81/+151
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| * | | | | | | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/50-buildunknown2006-12-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | This ChangeSet must be null-merged to 5.1.unknown2006-12-1811-81/+151
| * | | | | | | | | | | | Merge trift2.:/MySQL/M50/upward-5.0unknown2006-12-202-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-workunknown2006-12-182-0/+10
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-workunknown2006-12-181-0/+6
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Use a temporary directory for sockets if the socket path becomes too long.unknown2006-12-181-0/+6
| | | | * | | | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-buildunknown2006-12-151-0/+7
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|/ / | | | | | |/| | | | | | |
| | | | * | | | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-buildunknown2006-12-144-9/+16
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ / / | | | | | |/| | | | | / / | | | | | |_|_|_|_|_|/ / | | | | |/| | | | | | |
| | | * | | | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-buildunknown2006-12-181-1/+5
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / | | | | |/| | | | | | |
| | | * | | | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-buildunknown2006-12-150-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
| | | | * | | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-buildunknown2006-12-151-1/+9
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-buildunknown2006-12-144-9/+16
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|/ | | | | | |/| | | | | | |
| | * | | | | | | | | | | also include data files for varbinary test in binary distributionunknown2006-12-151-0/+1
View Lorry Controller Status