summaryrefslogtreecommitdiff
path: root/server-tools
Commit message (Expand)AuthorAgeFilesLines
* Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0jani@a193-229-222-105.elisa-laajakaista.fi2006-05-302-30/+37
|\
| * Fix for BUG#18023: IM: instance can be started several times;anozdrin@mysql.com2006-05-291-8/+14
| * Fix for BUG#19391: IM fails to start after two executionsanozdrin@mysql.com2006-05-291-22/+24
* | Merged.anozdrin@mysql.com2006-05-224-12/+17
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newanozdrin@mysql.com2006-05-2242-1359/+4656
|\ \
| * | 1. Fix compilation on Windows;anozdrin@mysql.com2006-05-191-0/+2
| * | Fix compilation problems on Windows and SUN Solaris.anozdrin@mysql.com2006-05-1910-16/+10
| * | Fix compilation on FC4.anozdrin@mysql.com2006-05-181-1/+2
| * | Fix compilation error on FC4.anozdrin@mysql.com2006-05-181-15/+15
| * | This is an implementation of two WL items:anozdrin@mysql.com2006-05-1842-1333/+4633
* | | Merge mysql.com:/usr/local/mysql/tmp_mergeknielsen@mysql.com2006-05-185-4/+77
|\ \ \ | | |/ | |/|
| * | Make it compilable on Windows.anozdrin@mysql.com2006-05-101-0/+2
| * | Partial fix for BUG#14106: IM: im_life_cycle and im_utilsanozdrin@mysql.com2006-05-065-5/+76
* | | Rename cmakelists.txt -> CMakeLists.txtmsvensson@neptunus.(none)2006-05-121-1/+1
* | | performing a set of bk mv on each CMakeLists.txt file to try and restore the ...reggie@big_geek.2006-05-111-0/+0
* | | Merge mysql.com:/home/jimw/my/mysql-5.0-cleanjimw@mysql.com2006-04-302-2/+60
|\ \ \ | |/ / | | / | |/ |/|
| * Bug#19362 im_daemon_lifecycle fails when built from source distributionmsvensson@neptunus.(none)2006-04-262-3/+61
* | Bug #19059: Failure to get version information when running from source treejimw@mysql.com2006-04-172-4/+4
* | Merge bk-internal:/home/bk/mysql-5.1-newjimw@mysql.com2006-04-121-32/+39
|\ \
| * | cleanup: sort IM options alphabeticallypetr@mysql.com2006-04-121-31/+38
* | | Support --debug/-# in instance manager.jimw@mysql.com2006-04-122-1/+20
|/ /
* | Remove unused variables and labelmsvensson@shellback.2006-04-102-3/+1
* | Some changes to make it possible to build for Windows with CMake fromknielsen@mysql.com2006-03-241-0/+2
* | Fix Windows CMake compilation after merge of Magnuses ssl patch.knielsen@mysql.com2006-03-161-1/+2
* | CMake Windows comp_error dependency fix after last push.knielsen@mysql.com2006-03-161-1/+1
* | Fix Windows CMake dependency problem.knielsen@mysql.com2006-03-161-1/+1
* | Moved cmake scripts into the proper directoriesReggie@xgeek.2006-03-151-0/+16
* | Merge mysql.com:/home/hartmut/projects/mysql/dev/5.0hartmut@mysql.com2006-03-141-4/+4
|\ \
| * | relying on loop counter variables being local to the loop body if hartmut@mysql.com2006-03-141-4/+4
| |/
* | Build fix, liboptions.a is now a libtool convenience librarymsvensson@neptunus.(none)2006-03-061-1/+1
* | Mergekent@mysql.com2006-03-061-4/+5
|\ \ | |/
| * Makefile.am:kent@mysql.com2006-03-031-5/+6
* | Merge mysql.com:/home/cps/mysql/devel/im/5.0-im-fix-racepetr@mysql.com2006-02-226-39/+93
|\ \ | |/
| * Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0petr@mysql.com2006-02-214-39/+85
| |\
| | * Fix race condition: instance map wasn't locked for thepetr@mysql.com2006-02-214-39/+85
| * | Fix for Bug #12674 "Instance Manager: IM doesn't handle clientpetr@mysql.com2006-02-212-0/+8
* | | Merge mysql.com:/home/cps/mysql/devel/im/5.0-im-add-error-messagepetr@mysql.com2006-02-181-7/+11
|\ \ \ | |/ /
| * | Add a shift in the parser. Forgotten in the previous commit.petr@mysql.com2006-02-181-0/+1
| * | fix Bug#12813 "Instance Manager: START/STOP INSTANCEpetr@mysql.com2006-02-141-7/+10
* | | Mergekent@mysql.com2006-02-121-1/+2
|\ \ \
| * | | Makefile.am:kent@mysql.com2006-02-091-1/+2
* | | | Merge mysql.com:/home/cps/mysql/devel/5.0-mikepetr@mysql.com2006-02-1011-16/+52
|\ \ \ \ | | |/ / | |/| |
| * | | a bunch of IM fixes from the GUI teampetr@mysql.com2006-02-1011-16/+52
| | |/ | |/|
* | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-newpetr@mysql.com2006-02-102-5/+50
|\ \ \
| * | | IM changes by GUI team: add a version_no column to thepetr@mysql.com2006-02-102-5/+50
| | |/ | |/|
* | | Merge mysql.com:/home/kostja/mysql/tmp_mergekonstantin@mysql.com2006-02-021-1/+1
|\ \ \ | |/ / |/| / | |/
| * mergedserg@serg.mylan2006-01-031-1/+1
| |\
| | * many warnings (practically safe but annoying) correctedserg@serg.mylan2006-01-031-1/+1
* | | Merge mysql.com:/home/stewart/Documents/MySQL/5.0/mainstewart@mysql.com2005-12-281-0/+3
|\ \ \ | |/ /
| * | locking issues,serg@serg.mylan2005-12-231-0/+3
| |/