1
0
mirror of https://github.com/MariaDB/server.git synced 2025-06-12 01:53:02 +03:00
Commit Graph

35 Commits

Author SHA1 Message Date
e46083c9cf Manual merge of 5.1 into 5.1-runtime 2007-03-01 13:47:28 -07:00
61b624eb76 Polishing:
1. use MySQL headers instead of system ones;
  2. move logical part of code into a separate function.
2007-02-20 21:28:30 +03:00
bfb2c3eb3d Fix build failures on Windows and Mac. 2007-02-20 12:28:24 +03:00
f97d10d236 Patch for IM in scope of working on BUG#24415: Instance manager test
im_daemon_life_cycle fails randomly.

1. Move IM-angel functionality into a separate file, create Angel class.
2. Be more verbose;
3. Fix typo in FLUSH INSTANCES implementation;
4. Polishing.
2007-02-18 15:45:28 +03:00
58763e383e Merge mysql.com:/home/kent/bk/main/mysql-5.0
into  mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-31 01:32:21 +01:00
6523aca729 my_strtoll10-x86.s:
Corrected spelling in copyright text
Makefile.am:
  Don't update the files from BitKeeper
Many files:
  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
Many files:
  Added GPL copyright text
Removed files:
  Docs/Support/colspec-fix.pl
  Docs/Support/docbook-fixup.pl
  Docs/Support/docbook-prefix.pl
  Docs/Support/docbook-split
  Docs/Support/make-docbook
  Docs/Support/make-makefile
  Docs/Support/test-make-manual
  Docs/Support/test-make-manual-de
  Docs/Support/xwf
2006-12-31 01:02:27 +01:00
be15e3bc15 Merge mysql.com:/home/kent/bk/main/mysql-5.0
into  mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-23 20:20:40 +01:00
226a5c833f Many files:
Changed header to GPL version 2 only
2006-12-23 20:17:15 +01:00
3e042c6d7b Polishing:
- change some return types from int to bool;
  - add [ERROR] tag to log_error() output;
  - add [INFO] tag to log_info() output;
  - change log messages to be more consistent.
2006-11-21 17:47:14 +03:00
ff0325f162 Polishing:
1) add support for joinable threads to Thread class;
2) move checking of thread model to Manager from mysqlmanager.cc,
because it is needed only for IM-main process.
2006-11-21 17:31:03 +03:00
2fc4562d63 Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for 
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
2006-11-18 01:34:44 +03:00
2f69dfb28f Cleanup: manually port the polishing parts from Alik's changeset for
BUG#22306: STOP INSTANCE can not be applied for instances in Crashed,
Failed and Abandoned
2006-11-16 23:36:20 +03:00
e3d0c1a7f1 Merged. 2006-05-22 15:20:40 +04:00
4a43bd1a3a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/mnt/raid/MySQL/devel/5.1-rt-wl3158-merged
2006-05-22 14:22:58 +04:00
b551722333 Fix compilation problems on Windows and SUN Solaris. 2006-05-19 04:51:23 +04:00
c1113af15c This is an implementation of two WL items:
- WL#3158: IM: Instance configuration extensions;
  - WL#3159: IM: --bootstrap and --start-default-instance modes

The following new statements have been added:
  - CREATE INSTANCE;
  - DROP INSTANCE;

The behaviour of the following statements have been changed:
  - SET;
  - UNSET;
  - FLUSH INSTANCES;
  - SHOW INSTANCES;
  - SHOW INSTANCE OPTIONS;
2006-05-18 18:57:50 +04:00
3b74668bfa Partial fix for BUG#14106: IM: im_life_cycle and im_utils
tests fail on FreeBSD.

The patch contains of the following:
  - make Instance Manager, running in the daemon mode, dump
    the pid of angel-process in the special file;
  - default value of angel-pid-file-name is 'mysqlmanager.angel.pid';
  - if ordinary (IM) pid-file-name is specified in the configuration,
    angel-pid-file-name is updated according to the following
    rule: extension of the basename of pid-file-name is replaced by
    '.angel.pid.
    For example:
    - pid-file-name: /tmp/im.pid
      => angel-pid-file-name: /tmp/im.angel.pid
    - pid-file-name: /tmp/im.txt
      => angel-pid-file-name: /tmp/im.angel.pid
    - pid-file-name: /tmp/5.0/im
      => angel-pid-file-name: /tmp/5.0/im.angel.pid
  - add support for configuration option to customize angel
    pid file name;
  - fix test suite to use angel pid to kill Instance Manager
    by all means if something went wrong.

Background
----------

The problem is that on some OSes (FreeBSD for one) Instance
Manager does not get SIGTERM, so can not shutdown gracefully.
Test suite wasn't able to cope with it, so this leads to the
mess in test results.

The problem should be split into two:
  - fix signal handling;
  - fix test suite.

This patch fixes test suite so that it will be able to kill
uncooperative Instance Manager. In order to achieve this,
test suite needs to know PID of IM Angel process.
2006-05-06 13:57:56 +04:00
1c7bc08537 a bunch of IM fixes from the GUI team 2006-02-10 02:15:55 +03:00
31be8fb694 fixed the service bits of the IM 2005-09-13 14:53:19 -05:00
2a00611f9c changes to IM that came from Petr and JimW's review. 2005-08-09 07:57:37 -06:00
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
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
f3de5d6b69 initial import of Windows port of IM. 2005-07-20 10:55:40 -05:00
180d0ed620 post-review fixes 2005-05-16 01:54:02 +04:00
b072eaa3da Fix for AIX compilation failure: sacred knowledge of my_global.h nature (it should be
included before any other include) was hidden from me.
2005-03-22 02:04:14 +03:00
59d8e51150 some more cleanups and fixes 2005-02-15 04:38:33 +03:00
1815de7b55 --user option added to mysqlmanager 2005-02-05 14:04:49 +03:00
63acf2a8be Various fixes (cleanups, valgrind, makefiles, ...) 2005-02-03 20:48:58 +03:00
fd94614f34 merge 2004-12-09 04:22:28 +03:00
0fa5496a18 portability fix 2004-11-17 01:52:33 +03:00
d2115d133d Some minor IM fixes 2004-11-15 14:53:30 +03:00
a8e2db4ecd Intermediate commit - just to make new files visible to bk in the new
tree
2004-10-23 11:32:52 +04:00
8be264691d Fix for the previous commit. I've added includes to the wrong file :( 2004-10-12 16:35:15 +04:00
75a3c99c91 First implementation for signal handling and multi-threading:
safe shutdown and signal deliverence to all threads in 
the manager process
2003-08-19 19:55:20 +04:00
36ce7d5fd5 First implementation of instance-manager carcass:
logging, options, angel process.
2003-08-16 21:44:24 +04:00