summaryrefslogtreecommitdiff
path: root/server-tools
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-buildkent@kent-amd64.(none)2007-03-201-8/+17
|\
| * Many files:kent@mysql.com/kent-amd64.(none)2007-03-191-8/+17
| * Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-basemalff/marcsql@weblab.(none)2007-03-017-22/+56
| |\
| | * Fix for BUG#22511: IM does not remove angel-pid-file on clean shutdownanozdrin/alik@booka.opbmk2007-02-241-0/+4
| | * Fix shutdown delay option name according to The Manual.anozdrin/alik@booka.opbmk2007-02-241-1/+1
| * | Fixed compiler warnings (for linux and win32 and win64)monty@mysql.com/narttu.mysql.fi2007-02-222-2/+2
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@janus.mylan2007-03-161-0/+0
|\ \ \
| * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@janus.mylan2007-03-061-4/+4
| |\ \ \
| * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@janus.mylan2007-02-265-6/+6
| |\ \ \ \
| * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@janus.mylan2007-02-211-0/+0
| |\ \ \ \ \
| | * | | | | /usr/share/aclocal/mysql.m4serg@janus.mylan2007-02-141-0/+0
* | | | | | | Merge BUG: Windows target won't compile.Kristofer.Pettersson@naruto.2007-03-021-2/+1
* | | | | | | Fixed compiler warningsmalff/marcsql@weblab.(none)2007-03-011-2/+0
* | | | | | | Manual merge of 5.1 into 5.1-runtimemalff/marcsql@weblab.(none)2007-03-011-1/+1
* | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-02-285-9/+9
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Remove compiler warningsmonty@mysql.com/narttu.mysql.fi2007-02-271-4/+4
| | |_|/ / / | |/| | | |
| * | | | | 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-234-5/+5
| |/ / / /
* | | | | Remove DBUG_ASSERT() -- essential functionality can not beanozdrin/alik@booka.opbmk2007-02-241-8/+8
* | | | | Fix merge.anozdrin/alik@booka.opbmk2007-02-241-0/+6
* | | | | Merge fix.anozdrin/alik@alik.opbmk2007-02-222-8/+11
* | | | | Merge alik.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rtanozdrin/alik@alik.opbmk2007-02-224-4/+31
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fix for BUG#24415: Instance manager test im_daemon_life_cycle fails randomly.anozdrin/alik@alik.opbmk2007-02-206-21/+51
* | | | | Fix powermacg5 build failure.anozdrin/alik@alik.opbmk2007-02-221-0/+1
* | | | | Polishing:anozdrin/alik@alik.opbmk2007-02-204-39/+59
* | | | | Fix Windows build.anozdrin/alik@alik.opbmk2007-02-201-1/+1
* | | | | Fix build failures on Windows and Mac.anozdrin/alik@booka.2007-02-202-0/+2
* | | | | Patch for IM in scope of working on BUG#24415: Instance manager testanozdrin/alik@alik.opbmk2007-02-1813-340/+646
| |/ / / |/| | |
* | | | Merge 192.168.0.10:mysql/mysql-5.1-maintmsvensson@pilot.mysql.com2007-02-061-1/+1
|\ \ \ \
| * | | | Fix windows buildmsvensson@pilot.mysql.com2007-02-061-1/+1
* | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1msvensson@neptunus.(none)2007-02-062-11/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2007-01-272-11/+10
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-229-17/+18
| | |\ \ | | | |/ | | |/|
| | | * Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-159-17/+18
| | * | Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0msvensson@pilot.mysql.com2007-01-171-5/+5
| | |\ \
| | | * \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2007-01-111-5/+5
| | | |\ \
| | * | \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2007-01-1129-41/+173
| | |\ \ \ \ | | | |/ / /
| | * | | | Merge siva.hindu.god:/usr/home/tim/m/bk/g50tsmith/tim@siva.hindu.god2006-12-2641-82/+41
| | |\ \ \ \
* | | | | | | Bug#22579 use --warning-mode=pedantic and -std=c89 flags when compiling with gccmsvensson@neptunus.(none)2007-01-292-4/+4
|/ / / / / /
* | | | | | Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51tsmith@siva.hindu.god2007-01-182-3/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1cmiller@zippy.cornsilk.net2007-01-073-7/+5
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/g51tsmith/tim@siva.hindu.god2006-12-263-7/+5
| | |\ \ \ \ \ \
| | | * | | | | | Changed config of mysqlmanager to use my.cnf search path.mtaylor@qualinost.(none)2006-12-151-1/+1
| | | * | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/50tsmith/tim@siva.hindu.god2006-12-142-6/+4
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | BUG#24687 func_misc test fails on win64msvensson@shellback.2006-12-142-6/+4
| | | | | |_|_|/ | | | | |/| | |
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2007-01-1213-962/+1373
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-01-0213-962/+1373
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Post-merge fixes.kostja@bodhi.local2006-12-121-2/+1
| | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2006-12-1213-961/+1373
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | Merge outpost.site:/home/cps/mysql/trees/5.0-runtime-19044petr/cps@outpost.site2006-12-041-5/+5
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | |