summaryrefslogtreecommitdiff
path: root/server-tools
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0unknown2005-10-098-43/+9
|\ \ \ \ | |/ / /
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-087-41/+7
| |\ \ \ | | |/ / | |/| |
| | * | pthread_handler_decl() changed to be ctags-friendlyunknown2005-10-087-41/+7
| * | | fix compile failure (which shows up in cygwin environment)unknown2005-10-072-2/+2
| |/ /
* | | Mergeunknown2005-10-0627-38/+43
|\ \ \ | |/ /
| * | Some fixes including implicit declaration of a function,unknown2005-10-041-3/+2
| * | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-3024-31/+30
| |\ \
| | * | Small fixes.unknown2005-09-301-2/+2
| | * | Some minor fixes revealed as warnings byunknown2005-09-2323-23/+22
| | * | Several fixes revelaled by Intel compiler.unknown2005-09-232-8/+8
| * | | portability.h:unknown2005-09-291-1/+1
| * | | portability.h:unknown2005-09-271-0/+4
| |/ /
| * | Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2005-09-231-2/+2
| |\ \
| | * | some last minute Windows compile fixes and makefile correctionsunknown2005-09-151-2/+2
| * | | fix warningsunknown2005-09-204-5/+8
| |/ /
* | | Merge neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_newunknown2005-09-1411-67/+172
|\ \ \ | |/ /
| * | fixed the service bits of the IMunknown2005-09-1310-31/+58
| * | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-132-36/+114
| |\ \ | | |/ | |/|
| | * A few changes to fix compiling on Windowsunknown2005-09-062-36/+114
* | | Merge frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0unknown2005-09-101-1/+1
|\ \ \ | |/ /
| * | options.cc:unknown2005-09-101-1/+1
| |/
* | Merge zim.(none):/home/brian/mysql/mysql-5.0unknown2005-08-3019-340/+157
|\ \ | |/
| * Remove a no longer used header.unknown2005-08-291-1/+0
| * Cleanup the instance manager code.unknown2005-08-2919-339/+157
* | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-259-180/+299
|\ \ | |/
| * Fix a -ansi -pedantic compile failure.unknown2005-08-221-1/+1
| * Fix for BUG#10957 "stop instance, issued after flush instances causes IM to c...unknown2005-08-193-101/+241
| * Clean up merge from 4.1unknown2005-08-151-1/+1
| * Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-104-64/+42
| |\
| | * changes to IM code that came from Petr's reviewunknown2005-08-093-7/+7
| | * fixed assignments to meet server coding guidelinesunknown2005-08-091-3/+3
| | * changes to IM that came from Petr and JimW's review.unknown2005-08-093-63/+41
| * | removing trailing spacesunknown2005-08-091-3/+3
| * | small corrections to the IM.unknown2005-08-092-14/+15
| |/
* | Manual merge of 5.0.11 changes into 5.1.1 - use "local" files in cases of con...unknown2005-08-1512-14/+15
|\ \ | |/
| * New "Instance Manager" code:unknown2005-08-0512-14/+15
* | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-0527-263/+1256
|\ \ | |/
| * post-review fixunknown2005-08-051-4/+5
| * chmod -x new IM filesunknown2005-08-056-0/+0
| * IM port cleanupunknown2005-08-058-227/+213
| * IM port fixes: fix crash on startup, add more error checking, get rid of unne...unknown2005-08-058-46/+39
| * Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-0425-218/+1231
| |\
| | * alot of formatting changes that came out of JimW's reviewunknown2005-08-0310-202/+212
| | * initial import of Windows port of IM.unknown2005-07-2025-220/+1236
* | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-228-42/+75
|\ \ \ | |/ /
| * | Post-review fixes for WL#2713 "Change IM behaviour so, that it only reads and...unknown2005-07-217-69/+29
| * | WL #2713 Change IM behaviour so, that it only reads and alters one config fil...unknown2005-07-219-32/+105
| |/
* | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-153-47/+59
|\ \ | |/
| * rename: store_to_string -> store_to_protocol_packetunknown2005-06-153-48/+57
| * Fix for Bug #11200 show instance options returns garbage instead of log optionsunknown2005-06-141-0/+3