Commit graph

362 commits

Author SHA1 Message Date
petr/cps@outpost.site
3c8ed475cb Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  outpost.site:/home/cps/mysql/trees/mysql-5.1-runtime
2006-11-23 18:26:56 +03:00
petr/cps@outpost.site
aad182fb26 Fix Bug #22242 Instance Manager: option-parsing errors
There was a memory overrun, which resulted in safemalloc
errors. Recommit with post-review fixes.
2006-11-22 19:07:05 +03:00
monty@nosik.monty.fi
89570bf966 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2006-11-22 14:11:36 +02:00
anozdrin/alik@booka.
720e352a82 Short fix for Windows. 2006-11-21 21:43:24 +03:00
anozdrin/alik@booka.
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
anozdrin/alik@booka.
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
anozdrin/alik@booka.
1efc862080 Polishing: use the same coding style everywhere. 2006-11-21 17:01:11 +03:00
monty@mysql.com/nosik.monty.fi
e825879800 Remove compiler warnings
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)
2006-11-20 22:42:06 +02:00
anozdrin/alik@booka.site
420d8b070b Polishing + make the code compiled on Windows. 2006-11-20 15:37:12 +03:00
kostja@bodhi.local
c136e8d528 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  bodhi.local:/opt/local/work/m51lamp
2006-11-20 13:01:19 +03:00
anozdrin/alik@booka.site
61e684943b Polishing: eliminate warnings. 2006-11-20 10:05:24 +03:00
kostja@bodhi.local
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
kostja@bodhi.local
d2248d973e A post-merge fix. 2006-11-17 20:07:52 +03:00
kostja@bodhi.local
33bbdf5c25 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  bodhi.local:/opt/local/work/m51lamp
2006-11-17 18:19:49 +03:00
anozdrin/alik@alik.
c6cd61a5cc Polishing: generate more warnings and make code warnings-free. 2006-11-17 16:45:29 +03:00
kostja@bodhi.local
7278f45bfd Replace the approach using Foo_thread_args + Foo_thread and manually
spawned threads with a reusable class Thread.

This is the second idea implemented in the Alik's patch for
BUG#22306: STOP INSTANCE can not be applied for instances in Crashed,
Failed and Abandoned.
Commiting separately to ease review process.
2006-11-17 16:11:04 +03:00
kostja@bodhi.local
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
petr/cps@outpost.site
1b44fe6196 Fix Bug #22494 Instance Manager: Inconsistent error message wording
Use better wording
2006-11-07 05:21:33 +03:00
anozdrin/alik@alik.
18fb4abff4 Merge alik.:/mnt/raid/alik/MySQL/devel/5.1-monty
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2006-11-03 14:00:35 +03:00
monty@mysql.com/nosik.monty.fi
ca99516cc7 Fixed a lot of compiler warnings (Mainly in mysqld and instance manager)
Fixed some possible fatal wrong arguments to printf() style functions
Initialized some not initialized variables
Fixed bug in stored procedure and continue handlers
(Fixes Bug#22150)
2006-11-01 19:41:09 +02:00
anozdrin/alik@alik.
c47c87ab88 IM polishing: log more information in log. 2006-10-24 18:31:10 +04:00
anozdrin/alik@alik.
f40a9d2ece Fix for BUG#17486: IM: race condition on exit.
The problem was that IM stoped guarded instances on shutdown,
but didn't wait for them to stop.

The fix is to wait for guarded instances to stop before exitting
from the main thread.

The idea is that Instance-monitoring thread should add itself
to Thread_registry so that it will be taken into account on shutdown.
However, Thread_registry should not signal it on shutdown in order to
not interrupt wait()/waitpid().
2006-10-24 18:23:16 +04:00
kostja@bodhi.local
06d943f137 Post-merge fixes. 2006-10-23 20:08:00 +04:00
kostja@bodhi.local
2fecf79536 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-10-23 12:35:56 +04:00
anozdrin/alik@alik.
643606cac9 Instance Manager polishing. 2006-10-20 22:26:40 +04:00
petr/cps@mysql.com/owlet.local
96c6f6f5c2 Fix Bug #19368 Failure in "flush_instances" causes assert in Thread_registry
Stop guardian and all the rest of threads before shutdown in case of an error
2006-10-05 22:07:21 +04:00
petr/cps@mysql.com/owlet.local
2073e4a1cb Fix Bug #22472 IM: --socket option should be removed from Windows version
the option is useless on windows. It was removed from listing of
mysqlmanager --help on Windows
2006-10-05 01:24:53 +04:00
anozdrin/alik@alik.
2c73dbfaac Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-rt
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2006-09-28 15:10:18 +04:00
msvensson@neptunus.(none)
f3c7b029d7 Merge neptunus.(none):/home/msvensson/mysql/bug22379_runtime/my50-bug22379_runtime
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-runtime
2006-09-26 15:44:52 +02:00
msvensson@neptunus.(none)
18f04d48a4 Merge neptunus.(none):/home/msvensson/mysql/bug22379_runtime/my50-bug22379_runtime
into  neptunus.(none):/home/msvensson/mysql/bug22379_runtime/my51-bug22379_runtime
2006-09-25 09:34:34 +02:00
msvensson@neptunus.(none)
d2ebe6be03 Bug #22379 im_daemon_life_cycle.test fails on merge of 5.1 -> 5.1-engines
Remove race situations that occur when removing pidfiles. Primarily each process should remove its own
pidfile, secondly it should be removed by the process that created it and _only_ if it's
certain the process is dead. Third, mysql-test-run.pl will remove the pidfile when process has been killed.
- Set state of an instance to STARTING _before_ calling instance->start()
- Check that pidfile of instance has been created before changing STARTING => STARTED
- Only remove the pidfile if IM kills an instance with SIGKILL, otherwise the instance will remove it itself
2006-09-25 09:28:52 +02:00
cmiller@zippy.cornsilk.net
a4d39c753a Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-05 17:44:08 -04:00
anozdrin/alik@alik.
6b6ba582e2 Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-tree
into  alik.:/mnt/raid/alik/MySQL/devel/5.0-rt
2006-09-05 17:42:59 +04:00
anozdrin/alik@alik.
725bb2e6af Fix for BUG#12751: Instance Manager: client hangs after
start instance; kill mysqlmanager; show ...

The problem was that Instance Manager didn't close client
sockets (sockets for client connections) on execing mysqld
instance. So, mysqld-instance inherits these descriptors.

The fix is to set close-on-exec flag for each client socket.
2006-09-01 18:20:33 +04:00
georg@lmy002.wdf.sap.corp
9d6471c33e make dist changes for Cmake build 2006-09-01 10:32:12 +02:00
georg@lmy002.wdf.sap.corp
27636d9303 Additional files for cmake support 2006-08-31 19:52:42 +02:00
brian@zim.(none)
7216b5bc7a Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into  zim.(none):/home/brian/mysql/arch-5.1
2006-08-25 14:07:30 -07:00
brian@zim.(none)
d41188130a This is a cleanup of warnings that windows is complaining about. 2006-08-23 15:12:42 -07:00
cmiller@zippy.cornsilk.net
f2f90320de Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
2006-08-21 12:59:46 -04:00
rburnett@production.mysql.com
284fa931bb A couple of adjustments to the merge to fix the broken build
instance.cc:
  Removed wrongly placed closing brace
item_geofunc.cc:
  needed to pass in a TABLE_SHARE* instead of a TABLE*
2006-08-17 22:24:35 +02:00
rburnett@bk-internal.mysql.com
d65095b451 Merge bk-internal.mysql.com:/data0/bk/tmp_reg
into  bk-internal.mysql.com:/data0/bk/mysql-5.1
2006-08-17 17:19:41 +02:00
cmiller@zippy.cornsilk.net
6998c5140b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
2006-08-17 10:53:12 -04:00
cmiller@zippy.cornsilk.net
c627a6ce84 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
2006-08-17 10:42:50 -04:00
kroki/tomash@moonlight.intranet
5c272816ca Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
2006-08-09 13:37:20 +04:00
hartmut@mysql.com/linux.site
73c77c00fa 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-08-05 13:41:22 +02:00
msvensson@neptunus.(none)
2469667e4b Bug#20190 Unixware 7.13 port and make test errors
- Thanks to cerber for the patch!
2006-08-03 17:29:35 +02:00
rburnett@bk-internal.mysql.com
4b80ef2007 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-07-27 16:17:17 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
47a9da936c mysqlmanager.vcproj:
Place mysqlmanager 'pdb' file in 'client_debug' directory
mysys.vcproj:
  Removed define of __NT__ from 'Debug' target
mysqld.vcproj:
  Always generate 'pdb' and 'map' files
2006-07-22 02:00:33 +02:00
kostja@bodhi.local
d7845b74db Merge bodhi.local:/opt/local/work/tmp_merge
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
2006-07-13 22:09:36 +04:00
jimw@rama.(none)
a34f37acdd Bug #12673: Instance Manager: allows to stop the instance many times
The instance manager was not actually checking whether an instance
  was actually running before trying to stop it. Now it checks first.
2006-07-12 12:30:22 -07:00
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