Commit graph

108 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
fb63290635 Merge neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new
into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my51-bug10713_new
2005-09-14 09:43:56 +02:00
reggie@ubuntu.(none)
31be8fb694 fixed the service bits of the IM 2005-09-13 14:53:19 -05:00
reggie@linux.site
6985adffc1 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into  linux.site:/home/reggie/bk/mysql-5.0-new
2005-09-13 12:59:20 -06:00
paul@frost.snake.net
dc287e7caa Merge frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0
into  frost.snake.net:/private/tmp/merge-5.1
2005-09-10 19:30:02 -05:00
paul@frost.snake.net
c26dd3057c options.cc:
Fix typo.
2005-09-10 16:01:26 -05:00
reggie@linux.site
eced05c3cd A few changes to fix compiling on Windows 2005-09-06 18:06:06 -06:00
brian@zim.(none)
57403ddc9d Merge zim.(none):/home/brian/mysql/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.1

Resolved to minor issues.
2005-08-30 14:40:02 -07:00
konstantin@mysql.com
2c9db925fa Remove a no longer used header. 2005-08-29 23:32:47 +04:00
konstantin@mysql.com
344144ad14 Cleanup the instance manager code. 2005-08-29 23:29:35 +04:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
02056f8e3a Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-25 13:11:38 -04:00
konstantin@mysql.com
c75cfc358e Fix a -ansi -pedantic compile failure. 2005-08-22 18:59:47 +04:00
petr@mysql.com
5605117d4d Fix for BUG#10957 "stop instance, issued after flush instances causes IM to crash"
Recommited with post-review fixes
2005-08-19 17:19:12 +04:00
jimw@mysql.com
68d5420d7c Clean up merge from 4.1 2005-08-15 14:19:56 -07:00
joerg@mysql.com
880bbb0406 Manual merge of 5.0.11 changes into 5.1.1 - use "local" files in cases of conflict. 2005-08-15 19:51:01 +02:00
reggie@linux.site
3e964a18d2 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into  linux.site:/home/reggie/bk/mysql-5.0-new
2005-08-10 05:02:37 -06:00
reggie@linux.site
153ad3f687 changes to IM code that came from Petr's review 2005-08-09 07:57:40 -06:00
reggie@linux.site
88ebfb5bc6 removing trailing spaces 2005-08-09 07:57:39 -06:00
reggie@linux.site
7fa1779d62 fixed assignments to meet server coding guidelines 2005-08-09 07:57:38 -06:00
reggie@linux.site
2a00611f9c changes to IM that came from Petr and JimW's review. 2005-08-09 07:57:37 -06:00
reggie@linux.site
850f53bbf4 small corrections to the IM. 2005-08-09 07:57:36 -06:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
69acde961f Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-05 18:01:34 -04:00
joerg@mysql.com
294aa66d92 New "Instance Manager" code:
Rename "port.h" to "portability.h" to avoid conflict with system header file name,
and include the file in "Makefile.am".
2005-08-05 20:44:52 +02:00
petr@mysql.com
ee6109e95f post-review fix 2005-08-05 17:48:37 +04:00
petr@mysql.com
21a1f466ba chmod -x new IM files 2005-08-05 17:09:02 +04:00
petr@mysql.com
22ccfb4d67 IM port cleanup 2005-08-05 17:02:06 +04:00
petr@mysql.com
a64f264e4b IM port fixes: fix crash on startup, add more error checking, get rid of unnecessary code. 2005-08-05 14:35:30 +04:00
reggie@fedora.(none)
72c0a021e9 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into  fedora.(none):/home/reggie/bk/im_patch
2005-08-04 09:33:44 -05:00
reggie@fedora.(none)
8cb3bd41c8 alot of formatting changes that came out of JimW's review 2005-08-03 16:20:27 -05:00
ndbdev@dl145b.mysql.com
e4c53b737e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-22 02:56:25 +02:00
petr@mysql.com
9644bc3e2b Post-review fixes for WL#2713 "Change IM behaviour so, that it only reads and alters one config file only." 2005-07-21 22:40:53 +04:00
petr@mysql.com
b9fcdfbb0f WL #2713 Change IM behaviour so, that it only reads and alters one config file only.
Implemented on brian's request.
2005-07-21 14:21:23 +04:00
reggie@fedora.(none)
f3de5d6b69 initial import of Windows port of IM. 2005-07-20 10:55:40 -05:00
tulin@dl145c.mysql.com
75759f13ff Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-15 07:50:47 +02:00
petr@mysql.com
a9d376b42b rename: store_to_string -> store_to_protocol_packet 2005-06-15 01:06:25 +04:00
petr@mysql.com
489598716a Fix for Bug #11200 show instance options returns garbage instead of log options 2005-06-14 17:13:42 +04:00
tulin@dl145b.mysql.com
b1a3d74f20 merge 2005-06-07 19:38:28 +02:00
petr@mysql.com
a2331d37b6 several fixes to the previous patch 2005-06-07 17:57:20 +04:00
petr@mysql.com
65d79b9d83 post-review fixes 2005-06-07 15:47:02 +04:00
petr@mysql.com
c7581758ec fix IM to display version string in "show instance status" (Bug #10229) 2005-06-01 04:40:22 +04:00
tulin@dl145c.mysql.com
be861a7ccf merge 2005-05-19 09:04:24 +02:00
jimw@mysql.com
6757a04e4c Merge mysql.com:/home/jimw/my/mysql-5.0-build
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-05-18 17:13:31 -07:00
tulin@dl145c.mysql.com
03590c20bd merge 2005-05-18 22:26:23 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
c63ad3b549 New file default_modify.c. Fixed a typo on mysqld.cc
Changed name of function my_correct_default_file to
modify_defaults_file. Improved function and fixed some
bugs in it.
2005-05-18 20:10:17 +03:00
petr@mysql.com
5395a2db7e fix for compilation problem with --with-openssl reported by Guilhem 2005-05-18 16:05:58 +04:00
petr@mysql.com
67364e99af fix comments 2005-05-18 15:28:38 +04:00
kent@mysql.com
72ce7299a9 commands.cc, parse.h, parse.cc, instance_options.cc:
Prefix enum symbols LOG_* with IM_, not to clash with system headers
2005-05-18 12:34:38 +02:00
tulin@dl145c.mysql.com
23f79bd1f2 merge 2005-05-17 10:17:53 +02:00
tulin@dl145c.mysql.com
e5976800f7 make dist target fixes 2005-05-16 14:11:42 +02:00
petr@mysql.com
834c47f336 Merge 2005-05-16 03:01:05 +04:00
petr@mysql.com
180d0ed620 post-review fixes 2005-05-16 01:54:02 +04:00