summaryrefslogtreecommitdiff
path: root/server-tools
Commit message (Expand)AuthorAgeFilesLines
* Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51unknown2007-01-182-3/+2
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-01-073-7/+5
| |\
| | * Merge siva.hindu.god:/usr/home/tim/m/bk/g51unknown2006-12-263-7/+5
| | |\
| | | * Changed config of mysqlmanager to use my.cnf search path.unknown2006-12-151-1/+1
| | | * Merge siva.hindu.god:/usr/home/tim/m/bk/50unknown2006-12-142-6/+4
| | | |\
| | | | * BUG#24687 func_misc test fails on win64unknown2006-12-142-6/+4
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-01-1213-962/+1373
|\ \ \ \ \
| * \ \ \ \ Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-baseunknown2007-01-0213-962/+1373
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Post-merge fixes.unknown2006-12-121-2/+1
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-12-1213-961/+1373
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Merge outpost.site:/home/cps/mysql/trees/5.0-runtime-19044unknown2006-12-041-5/+5
| | | |\ \ \
| | | | * | | Fix Bug #19044 IM aborts on exitunknown2006-12-041-5/+5
| | | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-12-0112-956/+1368
| | | |\ \ \ \
| | | | * | | | Fix for the following bugs:unknown2006-11-3012-956/+1368
| * | | | | | | server-tools/instance-manager/Makefile.amunknown2007-01-021-1/+1
* | | | | | | | Merge trift2.:/MySQL/M51/clone-5.1unknown2007-01-021-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | stole magnus' fix for random im test failures from 5.1-maintunknown2006-12-061-0/+1
| * | | | | | | build fix for instance manager build on aix and hpuxunknown2006-12-061-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Many files:unknown2006-12-312-0/+30
* | | | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0unknown2006-12-3128-49/+132
|\ \ \ \ \ \ \
| * | | | | | | my_strtoll10-x86.s:unknown2006-12-3129-41/+173
* | | | | | | | Many files:unknown2006-12-274-8/+4
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0unknown2006-12-2341-82/+41
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Many files:unknown2006-12-2341-82/+41
| | |_|_|_|/ | |/| | | |
* | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2006-12-091-0/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Initialize guarded_instance to NULL in constuctor. Avoid looping overunknown2006-12-061-0/+1
| | |/ / / | |/| | |
* | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2006-12-031-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | This finishes the work (someone) started to remove FIELD_ types and use the E...unknown2006-12-011-1/+1
| | |/ / | |/| |
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-11-301-1/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Merge mysql.com:/home/my/mysql-5.0unknown2006-11-301-1/+0
| |\ \ \ | | |/ /
| | * | Fixed compiler warningsunknown2006-11-302-3/+0
| | |/
| * | Fixed a LOT of compiler warningsunknown2006-11-271-1/+0
| * | Merge mysql.com:/home/my/mysql-5.0unknown2006-11-221-19/+12
| |\ \ | | |/
| | * Remove compiler warningsunknown2006-11-201-10/+10
* | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2006-11-231-8/+57
|\ \ \
| * | | Fix Bug #22242 Instance Manager: option-parsing errorsunknown2006-11-221-6/+55
| |/ /
* | | Short fix for Windows.unknown2006-11-211-0/+2
* | | Polishing:unknown2006-11-2117-203/+263
* | | Polishing:unknown2006-11-219-77/+146
* | | Polishing: use the same coding style everywhere.unknown2006-11-213-21/+21
* | | Polishing + make the code compiled on Windows.unknown2006-11-205-13/+18
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2006-11-202-2/+2
|\ \ \
| * | | Polishing: eliminate warnings.unknown2006-11-202-2/+2
* | | | Port cleanups, trivial refactoring and code rearrangements fromunknown2006-11-1822-425/+511
|/ / /
* | | A post-merge fix.unknown2006-11-172-6/+5
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2006-11-1713-420/+336
|\ \ \
| * | | Replace the approach using Foo_thread_args + Foo_thread and manuallyunknown2006-11-1713-420/+336
* | | | Polishing: generate more warnings and make code warnings-free.unknown2006-11-178-17/+39
|/ / /
* | | Cleanup: manually port the polishing parts from Alik's changeset forunknown2006-11-1620-199/+204
|/ /
* | Fix Bug #22494 Instance Manager: Inconsistent error message wordingunknown2006-11-071-1/+1