mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
51722 commits 2784 branches 343 tags 1.6 GiB
Commit graph

362 commits

Author SHA1 Message Date
konstantin/kostja@bodhi.local
377e0862ca Fixes for Windows compilation failures. 2006-07-07 16:14:07 +04:00
kent@mysql.com
593b359d92 mysql.spec.sh: 
Disable old RPM strip
my_global.h:
  Fixed wrong cast, which caused problems with gcc 4.0 and
  floats in prepared statements (Bug #19694)
mysqlmanager.vcproj:
  Place output files in common release/debug directory
 2006-06-30 02:49:28 +02:00
knielsen@rt.int.sifira.dk
4966090d3f Merge mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2 
into  mysql.com:/usr/local/mysql/tmp-5.1
 2006-06-23 15:05:15 +02:00
knielsen@mysql.com
af9e69b512 Merge mysql.com:/usr/local/mysql/mysql-5.0-bug20622 
into  mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2
 2006-06-23 14:59:40 +02:00
knielsen@mysql.com
d74a0457b6 Merge mysql.com:/usr/local/mysql/mysql-5.0-bug20622 
into  mysql.com:/usr/local/mysql/tmp-5.0
 2006-06-23 14:52:04 +02:00
knielsen@mysql.com
98a5cdfe4c BUG#20622: Fix one-byte buffer overrun in IM directory string handling. 
The problem was a call to convert_dirname() with a destination buffer
that did not have room for the trailing slash added by that function.
This could cause the instance manager to crash in some cases.
 2006-06-23 14:50:02 +02:00
anozdrin@mysql.com
42ef881906 Merge mysql.com:/home/alik/MySQL/devel/5.0-to-be-merged 
into  mysql.com:/home/alik/MySQL/devel/5.1-merged
 2006-06-20 18:28:28 +04:00
anozdrin@mysql.com
7ecfadbcf2 Polishing: C_STRING_WITH_SIZE() was renamed to C_STRING_WITH_LEN(). 2006-06-19 15:17:15 +04:00
anozdrin@mysql.com
3b6397b1d2 WL#3298: IM: make command-line option names consistent 
1. Removed '-P' command line option;
2. Renamed '--passwd' command line option to '--print-password-line'.
 2006-06-19 14:41:29 +04:00
anozdrin@mysql.com
a992833d83 The second fix for BUG#19391: IM fails to start after two executions. 2006-06-19 14:16:10 +04:00
monty@mysql.com
e50412ef38 Re-apply missing changeset, orignally pushed by elliot 
Add define YASSL_PREFIX when compiling yassl

Import patch from yaSSL
- avoid allocating memory for each call to 'EVP_md5' and 
  'EVP_des_ede3_cbc' which were not released until server was stopped
- Those functions are used from the SQL function 'des_encrypt' and
  'des_decrypt'.

Add new define YASSL_PREFIX beforee including ssl.h to activate inclusion of prefix_*.h files

Bug#20022 mysql-test-run can't be run with secure connections turned on for all testcases
- Part 1, fixes rpl- and federated-tests where connection is made to 127.0.0.1

- Include prefix files that renames all public functions in yaSSLs
  OpenSSL API to ya<function_name>. They will otherwise conflict
  with OpenSSL functions if loaded by an application that uses OpenSSL
  as well as libmysqlclient with yaSSL support.

Bug#18235: assertion/crash when windows mysqld is ended with ctrl-c
  
Two threads both try a shutdown sequence which creates a race to the
de-init/free of certain resources.
  
This exists in similar form in the client as 17926: "mysql.exe crashes
when ctrl-c is pressed in windows."

Update after merge to 5.0

BUG#18669: Session COM_STATISTICS breaks mysqladmin status.
Changed COM_STATISTICS to display the global status, instead of thead status, for slow queries and table opens.

- In function 'handle_grant_struct' when searching the memory structures for an 
  entry to modify, convert all entries here host.hostname is NULL to "" and compare that 
  with the host passed in argument "user_from".
- A user created with hostname "" is stored in "mysql.user" table as host="" but when loaded into 
  memory it'll be stored as host.hostname NULL. Specifiying "" as hostname means
  that "any host" can connect. Thus is's correct to turn on allow_all_hosts
  when such a user is found. 
- Review and fix other places where host.hostname may be NULL.

BUG#19394 OPT_INNODB_THREAD_CONCURRENCY duplicated
Removed duplication (not a user-visible change)
 2006-06-06 14:21:07 +03:00
msvensson@shellback.(none)
c542aa8701 Merge shellback.(none):/home/msvensson/mysql/bug19575/my50-bug19575 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-05-31 16:32:08 +02:00
msvensson@shellback.(none)
20217ba36f Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_init 
- Include prefix files that renames all public functions in yaSSLs
   OpenSSL API to ya<function_name>. They will otherwise conflict
   with OpenSSL functions if loaded by an application that uses OpenSSL
   as well as libmysqlclient with yaSSL support.
 2006-05-31 16:19:06 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
c81b4c01bf Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
 2006-05-30 16:07:49 +03:00
anozdrin@mysql.com
711a230517 Fix for BUG#18023: IM: instance can be started several times; 
monitor interval must be > 2sec.
 2006-05-29 17:30:30 +04:00
anozdrin@mysql.com
c368dc18b7 Fix for BUG#19391: IM fails to start after two executions 2006-05-29 17:26:52 +04:00
anozdrin@mysql.com
e3d0c1a7f1 Merged. 2006-05-22 15:20:40 +04:00
anozdrin@mysql.com
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
anozdrin@mysql.com
64166ebf27 1. Fix compilation on Windows; 
2. Fix trigger.test.
 2006-05-19 16:01:04 +04:00
anozdrin@mysql.com
b551722333 Fix compilation problems on Windows and SUN Solaris. 2006-05-19 04:51:23 +04:00
anozdrin@mysql.com
40f934009e Fix compilation on FC4. 2006-05-18 23:34:35 +04:00
anozdrin@mysql.com
417440fb6b Fix compilation error on FC4. 2006-05-18 22:31:28 +04:00
anozdrin@mysql.com
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
knielsen@mysql.com
a061c90d8a Merge mysql.com:/usr/local/mysql/tmp_merge 
into  mysql.com:/usr/local/mysql/merge-5.1
 2006-05-18 11:56:50 +02:00
msvensson@neptunus.(none)
40bfe246a9 Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
reggie@big_geek.
67a692f998 performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1. 
This is being pushed to a private tree and tested before being sent to the mainline.
 2006-05-11 11:29:08 -05:00
anozdrin@mysql.com
247be7d4a9 Make it compilable on Windows. 2006-05-10 18:53:28 +04:00
anozdrin@mysql.com
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
jimw@mysql.com
f21c110d13 Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-30 13:27:38 -07:00
msvensson@neptunus.(none)
a0a8a711d6 Bug#19362 im_daemon_lifecycle fails when built from source distribution 
- Add function "mysqld_real_path" which is needed if the mysqld_path is a symlink or a script(like libtool) that executes the real mysqld.
- Add new variable mysqld_real_path
- Use mysqld_real_path from fill_instance_version
 2006-04-26 12:45:22 +02:00
jimw@mysql.com
80b8563690 Bug #19059: Failure to get version information when running from source tree 
Fix the way that instance manager finds the version number of instances,
  so that it works properly when the executable name isn't the same as what
  the instance-manager launched, such as when wrapping a libtool-wrapped
  executable from the source tree.

  This removes the 'Ver ' reported in the version column output by
  'SHOW INSTANCE STATUS ...', but the format of this column is not
  documented (and is pretty free-form to begin with).
 2006-04-17 09:38:50 -07:00
jimw@mysql.com
86d6b16113 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-12 13:01:26 -07:00
petr@mysql.com
9ac5b32a5f cleanup: sort IM options alphabetically 2006-04-12 23:08:50 +04:00
jimw@mysql.com
688659df11 Support --debug/-# in instance manager. 2006-04-12 11:14:56 -07:00
msvensson@shellback.
765024d829 Remove unused variables and label 2006-04-10 18:34:18 +02:00
knielsen@mysql.com
bc6628d27f Some changes to make it possible to build for Windows with CMake from 
a normal 'make dist' source .tar.gz.
 2006-03-24 22:50:56 +01:00
knielsen@mysql.com
8567553bcb Fix Windows CMake compilation after merge of Magnuses ssl patch. 2006-03-16 16:57:24 +01:00
knielsen@mysql.com
ca4ec28146 CMake Windows comp_error dependency fix after last push. 2006-03-16 15:42:48 +01:00
knielsen@mysql.com
24e29bf9d1 Fix Windows CMake dependency problem. 2006-03-16 13:30:59 +01:00
Reggie@xgeek.
11979eec94 Moved cmake scripts into the proper directories 2006-03-15 10:22:12 -06:00
hartmut@mysql.com
5e312c1581 Merge mysql.com:/home/hartmut/projects/mysql/dev/5.0 
into  mysql.com:/home/hartmut/projects/mysql/bk-clean/5.1
 2006-03-14 11:25:15 +01:00
hartmut@mysql.com
9da74d8a5f relying on loop counter variables being local to the loop body if 
declared in the 'for' statement is not portable, some compilers
still don't implement this ANSI C++ specification (Bug #14995)
 2006-03-14 11:13:41 +01:00
msvensson@neptunus.(none)
703d2f89d0 Build fix, liboptions.a is now a libtool convenience library 
-liboptions.a -> liboptions.la
 2006-03-06 17:17:22 +01:00
kent@mysql.com
ab77867efb Merge 2006-03-06 13:50:52 +01:00
kent@mysql.com
5557a442e9 Makefile.am: 
Use libtool convenience lib, to access get_password object correctly, bug#17155
 2006-03-03 02:46:47 +01:00
petr@mysql.com
8163afb43c Merge mysql.com:/home/cps/mysql/devel/im/5.0-im-fix-race 
into  mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-no-debug
 2006-02-22 11:27:21 +03:00
petr@mysql.com
ce4fd24da2 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/devel/im/5.0-im-fix-race
 2006-02-21 15:59:41 +03:00
petr@mysql.com
cb5e54e1bd Fix race condition: instance map wasn't locked for the 
duration of the whole 'flush instances'. As a consequence,
it was possible to query instance map, while it is in the
inconsistent state. The patch was reworked after review.
 2006-02-21 15:57:56 +03:00
petr@mysql.com
7146a9775e Fix for Bug #12674 "Instance Manager: IM doesn't handle client 
connections correctly".
Recommit with the max timeout value in sync with the comment.
 2006-02-21 15:32:52 +03:00
petr@mysql.com
d6a36615d6 Merge mysql.com:/home/cps/mysql/devel/im/5.0-im-add-error-message 
into  mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-debug
 2006-02-18 18:00:22 +03:00
petr@mysql.com
cb74e09f46 Add a shift in the parser. Forgotten in the previous commit. 2006-02-18 03:22:13 +03:00
petr@mysql.com
f20955af40 fix Bug#12813 "Instance Manager: START/STOP INSTANCE 
commands accept a list as argument"
 2006-02-14 03:09:17 +03:00
kent@mysql.com
eb9683442d Merge 2006-02-12 20:45:03 +01:00
petr@mysql.com
2e01c8b0d0 Merge mysql.com:/home/cps/mysql/devel/5.0-mike 
into  mysql.com:/home/cps/mysql/devel/5.1-merge
 2006-02-10 21:03:49 +03:00
petr@mysql.com
f3d73e8cbe Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/cps/mysql/devel/5.1-im-fixes
 2006-02-10 03:38:29 +03:00
petr@mysql.com
8488498545 IM changes by GUI team: add a version_no column to the 
SHOW INSTANCE STATUS output
 2006-02-10 03:35:07 +03:00
petr@mysql.com
1c7bc08537 a bunch of IM fixes from the GUI team 2006-02-10 02:15:55 +03:00
kent@mysql.com
9f86a9bdcc Makefile.am: 
Link with CLIENT_EXTRA_LDFLAGS, enable us to
  pass on libtool flags '-full-static' and '-static'
  using '--with-client-ldflags' to configure.
mysql.spec.sh:
  Pass '-static' to libtool, link static with our
  own libraries, dynamic with system libraries.
  Link with the bundled zlib.
 2006-02-09 03:11:45 +01:00
konstantin@mysql.com
92b41ba92a Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-02 16:57:34 +03:00
serg@serg.mylan
30c09d6dc0 merged 2006-01-03 18:12:03 +01:00
serg@serg.mylan
14f94dc0ca many warnings (practically safe but annoying) corrected 2006-01-03 17:54:54 +01:00
stewart@mysql.com
cac298e07b Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/new
 2005-12-28 13:55:59 +11:00
serg@serg.mylan
c063819075 locking issues, 
test for LONGLONG_MIN in decimal.c
 2005-12-23 20:50:28 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
5273071265 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
 2005-11-23 14:57:00 +02:00
kent@mysql.com
bcdd552d6e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
 2005-11-19 11:20:52 +01:00
guilhem@mysql.com
2f95fc2701 Merge mysql.com:/home/mysql_src/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
 2005-11-18 16:38:01 +01:00
joerg@mysql.com
74c57a6dc9 Provide a default "minimum thread stack size" PTHREAD_STACK_MIN where it is missing. 
(Currently, affects only BSD with Linuxthreads)
 2005-11-10 14:24:54 +01:00
kent@mysql.com
b269caecb1 Additional "make distcheck" changes specific to 5.0 2005-11-09 11:56:04 +02:00
monty@mysql.com
a6f5375cb0 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2005-11-05 01:32:55 +02:00
reggie@fedora.(none)
52eb44b042 make the IM compile on Windows 2005-11-02 09:30:01 -06:00
reggie@fedora.(none)
e3ff45d61e more refinement of IM patch to fix Windows pathnames with spaces 2005-11-02 06:51:44 -06:00
reggie@fedora.(none)
27e8da7985 improved previous changeset per JimW's review 2005-10-31 13:31:07 -05:00
reggie@fedora.(none)
53089ec4e4 fix some issues with IM and long pathnames (with spaces) 2005-10-31 13:31:06 -05:00
msvensson@neptunus.(none)
74c39cc118 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-10-28 13:51:42 +02:00
petr@mysql.com
27cb3d93c9 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
 2005-10-28 14:48:39 +04:00
petr@mysql.com
922cdfa025 fix Bug #14103 IM tests fail on SCO 2005-10-28 14:29:46 +04:00
msvensson@neptunus.(none)
68fa03258a Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-10-28 11:45:30 +02:00
petr@mysql.com
314a33c864 fix a typo 2005-10-28 13:02:26 +04:00
petr@mysql.com
88e651d8d1 Fix for Bug #14388 "IM eats 99% CPU" 2005-10-27 15:54:01 +04:00
petr@mysql.com
be6bb43021 Added a comment re Bug#14164 2005-10-27 04:00:31 +04:00
reggie@big_geek.
2e637a0b36 fix issue with IM that causes commandlines that are executed to be incorrect. 2005-10-25 09:29:39 -05:00
petr@mysql.com
62317fb4ae Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0
 2005-10-21 03:27:18 +04:00
petr@mysql.com
9e3d89b73e Fix Bug#14107 (IM test failures on QNX) 
(v.2 with post-review fixes)
 2005-10-21 03:25:07 +04:00
petr@mysql.com
1f97d42b3d fix compilation failure on serg's box: we shouldn't 
use USE_PRAGMA_INTERFACE before include of my_global.h,
where it is defined
 2005-10-19 00:31:00 +04:00
msvensson@neptunus.(none)
0684dc1342 Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linking 
- Use yassl_includes and yassl_libs instead of openssl_includes and openssl_libs 
   to avoid that mysql_config returns that libyassl and libtaocrypt are needed for linking.
 2005-10-18 15:43:59 +02:00
petr@mysql.com
5423ab00de Fix im tests on powermacg5: temporarily fix for problem with Darwin kernels. For more details see 
bug 2030. Will push a proper fix later
 2005-10-17 05:14:03 +04:00
kent@mysql.com
85ab53357b thread_registry.h, thread_registry.cc: 
Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX
Makefile.am:
  Preserve executable mode on scripts
make_binary_distribution.sh:
  Copy *.imtest files
 2005-10-16 06:49:19 +02:00
monty@mysql.com
5513ab69b7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-10-12 00:59:52 +03:00
monty@mysql.com
f5fdf3e87a Reviewing new pushed code 
- CHAR() now returns binary string as default
- CHAR(X*65536+Y*256+Z) is now equal to CHAR(X,Y,Z) independent of the character set for CHAR()
- Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
  (Some old systems returns ETIME and it's safer to test for both values
   than to try to write a wrapper for each old system)
- Fixed new introduced bug in NOT BETWEEN X and X
- Ensure we call commit_by_xid or rollback_by_xid for all engines, even if one engine has failed
- Use octet2hex() for all conversion of string to hex
- Simplify and optimize code
 2005-10-12 00:58:22 +03:00
serg@serg.mylan
2e2d18b7cf Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2005-10-09 19:10:19 +02:00
serg@serg.mylan
ba169f81e3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-10-08 16:59:41 +02:00
serg@serg.mylan
e91712d9bb pthread_handler_decl() changed to be ctags-friendly 
(and contain extern "C" when necessary)
 2005-10-08 16:39:55 +02:00
petr@mysql.com
54db9bab7c fix compile failure (which shows up in cygwin environment) 2005-10-07 20:25:51 +04:00
tomas@poseidon.ndb.mysql.com
620b7bafb0 Merge 2005-10-06 10:54:07 +02:00
jani@ua141d10.elisa.omakaista.fi
17e87da298 Some fixes including implicit declaration of a function, 
using wrong type in assignment etc.
 2005-10-04 18:20:57 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
43b544a968 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
 2005-09-30 12:36:23 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
aa08fd0d0a Small fixes. 2005-09-30 12:35:12 +03:00
kent@mysql.com
3b906e73d8 portability.h: 
Corrected OpenServer ifdef test
Makefile.am:
  Added test-pl and test-force-pl targets
 2005-09-29 19:37:03 +02:00
kent@mysql.com
cef2b507c7 portability.h: 
Define SHUT_RDWR for OpenServer 5
 2005-09-27 08:28:56 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
8d3036c35e Some minor fixes revealed as warnings by 
Intel compiler.
 2005-09-23 21:28:56 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
acf218b708 Several fixes revelaled by Intel compiler. 2005-09-23 16:47:08 +03:00
konstantin@mysql.com
2d4c54ba1b Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-09-23 00:46:59 +04:00
petr@mysql.com
6168d0d52c fix warnings 2005-09-20 03:14:07 +04:00
reggie@fedora.(none)
66e6453e2a some last minute Windows compile fixes and makefile corrections 2005-09-15 14:32:01 -05:00
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
serg@serg.mylan
9c332d8d2a yassl changeset 2: 
remove FIX_GCC_LINKING_PROBLEM and -DDEFINE_CXA_PURE_VIRTUAL
  replace echo in configure.in with AC_MSG_WARN/AC_MSG_ERROR
  don't set -DUSE_MYSYS_NEW for gcc 2.95
  set $USE_MYSYS_NEW even if CXX is g++
  yassl bugfixes
  instantiate all yassl templates explicitly
 2005-04-30 19:48:45 +02:00
petr@mysql.com
0584756fb4 merge 2005-04-21 01:27:03 +04:00
petr@mysql.com
9c015f2a09 Merge mysqldev@production.mysql.com:my/mysql-5.0-build 
into mysql.com:/home/cps/mysql/trees/mysql-5.0
 2005-04-11 17:20:29 +04:00
petr@mysql.com
da1d303001 make server logs less frightening, when using IM 2005-04-11 17:19:12 +04:00
petr@mysql.com
48b3332b8a Fix for bug #9808 2005-04-11 17:14:40 +04:00
petr@mysql.com
ace47c77be Fix for Bug #9589 2005-04-11 17:08:34 +04:00
petr@mysql.com
83f9ee0786 WL#2246 "IM: Add ability to change instance options, add server logs handling" ported to the 
current version of the IM
 2005-04-09 14:28:39 +04:00
petr@mysql.com
7730319738 Enable IM in the binary distribution and fix Bug #9513 (mysql.server script from the binary distibution 
doesn't work out of the box)
 2005-04-04 03:49:10 +04:00
joerg@mysql.com
4fd932b772 Revert the inclusion of 'signal.h' as the module contains 'kill()'. 2005-03-22 10:39:26 +01:00
petr@mysql.com
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
petr@mysql.com
f2791b9e96 fix to avoid relinking on each "make" 2005-03-02 23:16:32 +03:00
petr@mysql.com
8bed4a14e7 portability fix 2005-02-28 16:05:18 +03:00
petr@mysql.com
912dfdfa34 post-review fixes + cleanup + some minor fixes 2005-02-27 18:41:34 +03:00
petr@mysql.com
1e6bfa39c3 Merge mysql.com:/home/cps/mysql/trees/mysql-5.0 
into mysql.com:/home/cps/mysql/devel/im-fix-review
 2005-02-20 23:01:07 +03:00
petr@mysql.com
2c263ff24c CPPFLAGS is substituted with CXXFLAGS to work with older automake. Serg, now you can enable 
server-tools/instance-manager.
 2005-02-20 04:36:22 +03:00
petr@mysql.com
27e614dc7f new variant of passwd() by S. Vojtovich 2005-02-18 15:23:55 +03:00
petr@mysql.com
dbc0937dd0 made IM to work with --defaults-file smoothly 2005-02-18 14:58:30 +03:00
petr@mysql.com
be335ed4d1 Merge mysql.com:/home/cps/mysql/trees/mysql-5.0 
into mysql.com:/home/cps/mysql/devel/im-fix-review
 2005-02-15 17:34:26 +03:00
petr@mysql.com
59d8e51150 some more cleanups and fixes 2005-02-15 04:38:33 +03:00
petr@mysql.com
bb8e5b6227 various fixes 2005-02-13 15:13:33 +03:00
petr@mysql.com
6b50b5b087 Post-review fixes + some bugs fixed + several minor features 2005-02-11 14:21:59 +03:00
petr@mysql.com
1815de7b55 --user option added to mysqlmanager 2005-02-05 14:04:49 +03:00
petr@mysql.com
321c53d9d8 Fixed setup scripts to use mysqlmanager instead of mysqld_safe 2005-02-05 10:15:34 +03:00
petr@mysql.com
63acf2a8be Various fixes (cleanups, valgrind, makefiles, ...) 2005-02-03 20:48:58 +03:00
petr@mysql.com
84d5b3a332 more fixes for IM to substitude mysqld_safe in startup scripts 2005-01-31 23:54:08 +03:00
serg@serg.mylan
852f2e0aba small Makefile.am cleanup 
clean: targets removed
    generated *.h files moved to include/
 2005-01-28 17:14:03 +01:00
petr@mysql.com
ee08b749dd IM mostly fixed according to Brian's directions. Will need to do some additional option handling and cleanups 2005-01-25 13:54:56 +03:00
petr@mysql.com
fdb3b0b6c1 cleanup 2004-12-29 00:13:32 +03:00
petr@mysql.com
1ea48a2dbf Set default port to the one assigned by IANA 2004-12-23 20:47:03 +03:00
petr@mysql.com
584a7ffda4 Bug #7468 Instance Manager fails to compile: thread_registry.cc 
This fix icludes workaround for Irix compiler bug & removs some unused
variables (resulted in warnings)
 2004-12-22 01:00:29 +03:00
petr@mysql.com
52666fca26 fix for Bug#7386 - IM fails to compile on alpha with Compaq C++ compiler 2004-12-19 03:07:05 +03:00
petr@mysql.com
c7422f844b Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/cps/mysql/trees/mysql-5.0
 2004-12-17 12:34:32 +03:00
petr@mysql.com
95c44eff18 Fix for pekka's IM compilation failure at ndb.mysql.com 2004-12-17 12:08:59 +03:00
petr@mysql.com
1a1559d8b4 Fix for IM compilation failure (reported be Ramil). 2004-12-15 20:29:17 +03:00
anjuta@arthur.local
f9451974be WL#1051, more maintanable error messages. 2004-12-13 22:51:54 +02:00
petr@mysql.com
d40e0935ce fix autobuild failures 2004-12-12 20:59:15 +03:00
guilhem@mysql.com
be11a7d92f instance.cc: 
explicit setting of reconnect (no behaviour change)
 2004-12-09 22:22:34 +01:00
petr@mysql.com
fd94614f34 merge 2004-12-09 04:22:28 +03:00
petr@mysql.com
0faef6d0d1 Fix for the unixware: non-posix sigwait 2004-11-25 23:57:58 +03:00
petr@mysql.com
e3dde5f12f work around for compiler bug (5.0.2 build fails on octane2) 2004-11-19 19:46:16 +03:00
petr@mysql.com
0fa5496a18 portability fix 2004-11-17 01:52:33 +03:00
petr@mysql.com
d2115d133d Some minor IM fixes 2004-11-15 14:53:30 +03:00
petr@mysql.com
4f62e8b9d6 few more fixes - fix makefile and get rid of strncasecmp in favour of 
my_strnncoll
 2004-11-06 23:18:28 +03:00
petr@mysql.com
b2e3626e52 fix for the IM linking problem 2004-11-06 02:14:56 +03:00
petr@mysql.com
96aa04bf8e protability fix 2004-11-04 11:24:14 +03:00
petr@mysql.com
13570dcf9f linking problem fix 2004-11-04 02:42:22 +03:00