summaryrefslogtreecommitdiff
path: root/server-tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1brian@zim.(none)2006-08-251-1/+1
|\ | | | | | | into zim.(none):/home/brian/mysql/arch-5.1
| * This is a cleanup of warnings that windows is complaining about. brian@zim.(none)2006-08-231-1/+1
| |
* | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0cmiller@zippy.cornsilk.net2006-08-211-1/+5
|\ \ | |/ |/| | | into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
| * Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_mergecmiller@zippy.cornsilk.net2006-08-171-4/+4
| |\ | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
| | * relying on loop counter variables being local to the loop body if hartmut@mysql.com/linux.site2006-08-051-4/+4
| | | | | | | | | | | | | | | declared in the 'for' statement is not portable, some compilers still don't implement this ANSI C++ specification (Bug #14995)
| * | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_mergecmiller@zippy.cornsilk.net2006-08-171-1/+5
| |\ \ | | |/ | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
| | * Bug#20190 Unixware 7.13 port and make test errorsmsvensson@neptunus.(none)2006-08-031-1/+5
| | | | | | | | | | | | - Thanks to cerber for the patch!
* | | A couple of adjustments to the merge to fix the broken buildrburnett@production.mysql.com2006-08-171-1/+0
| | | | | | | | | | | | | | | | | | | | | instance.cc: Removed wrongly placed closing brace item_geofunc.cc: needed to pass in a TABLE_SHARE* instead of a TABLE*
* | | Merge bk-internal.mysql.com:/data0/bk/tmp_regrburnett@bk-internal.mysql.com2006-08-172-30/+32
|\ \ \ | |/ / | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.1
| * | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0rburnett@bk-internal.mysql.com2006-07-271-1/+1
| |\ \ | | |/ | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
| * | Bug #12673: Instance Manager: allows to stop the instance many timesjimw@rama.(none)2006-07-122-25/+26
| | | | | | | | | | | | | | | The instance manager was not actually checking whether an instance was actually running before trying to stop it. Now it checks first.
* | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_mergekroki/tomash@moonlight.intranet2006-08-091-1/+1
|\ \ \ | | |/ | |/| | | | into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
| * | mysqlmanager.vcproj:kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se2006-07-221-1/+1
| |/ | | | | | | | | | | | | | | 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
* | Merge bodhi.local:/opt/local/work/tmp_mergekostja@bodhi.local2006-07-131-2/+2
|\ \ | |/ | | | | into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
| * mysql.spec.sh:kent@mysql.com2006-06-301-2/+2
| | | | | | | | | | | | | | | | | | 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
| * Merge mysql.com:/usr/local/mysql/mysql-5.0-bug20622knielsen@mysql.com2006-06-231-2/+7
| |\ | | | | | | | | | into mysql.com:/usr/local/mysql/tmp-5.0
* | | Fixes for Windows compilation failures.konstantin/kostja@bodhi.local2006-07-071-1/+1
| | |
* | | Merge mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2knielsen@rt.int.sifira.dk2006-06-231-2/+7
|\ \ \ | | | | | | | | | | | | into mysql.com:/usr/local/mysql/tmp-5.1
| * \ \ Merge mysql.com:/usr/local/mysql/mysql-5.0-bug20622knielsen@mysql.com2006-06-231-2/+7
| |\ \ \ | | | |/ | | |/| | | | | into mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2
| | * | BUG#20622: Fix one-byte buffer overrun in IM directory string handling.knielsen@mysql.com2006-06-231-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge mysql.com:/home/alik/MySQL/devel/5.0-to-be-mergedanozdrin@mysql.com2006-06-202-13/+32
|\ \ \ \ | | |_|/ | |/| | | | | | into mysql.com:/home/alik/MySQL/devel/5.1-merged
| * | | The second fix for BUG#19391: IM fails to start after two executions.anozdrin@mysql.com2006-06-193-16/+32
| | | |
| * | | Merge shellback.(none):/home/msvensson/mysql/bug19575/my50-bug19575msvensson@shellback.(none)2006-05-311-1/+1
| |\ \ \ | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.0
| | * | | Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_initmsvensson@shellback.(none)2006-05-311-1/+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.
* | | | | Polishing: C_STRING_WITH_SIZE() was renamed to C_STRING_WITH_LEN().anozdrin@mysql.com2006-06-194-8/+8
| | | | |
* | | | | WL#3298: IM: make command-line option names consistentanozdrin@mysql.com2006-06-193-11/+12
| |_|/ / |/| | | | | | | | | | | | | | | 1. Removed '-P' command line option; 2. Renamed '--passwd' command line option to '--print-password-line'.
* | | | Re-apply missing changeset, orignally pushed by elliotmonty@mysql.com2006-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | | 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
|\ \ \ \ | |/ / / | | | | | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
| * | | Fix for BUG#18023: IM: instance can be started several times;anozdrin@mysql.com2006-05-291-8/+14
| | | | | | | | | | | | | | | | monitor interval must be > 2sec.
| * | | 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
|\ \ \ | | | | | | | | | | | | into mysql.com:/mnt/raid/MySQL/devel/5.1-rt-wl3158-merged
| * | | 1. Fix compilation on Windows;anozdrin@mysql.com2006-05-191-0/+2
| | | | | | | | | | | | | | | | 2. Fix trigger.test.
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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;
* | | | Merge mysql.com:/usr/local/mysql/tmp_mergeknielsen@mysql.com2006-05-185-4/+77
|\ \ \ \ | | |/ / | |/| | | | | | into mysql.com:/usr/local/mysql/merge-5.1
| * | | 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
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | 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
| | | | | | | | | | | | | | | | | | 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.
* | | Merge mysql.com:/home/jimw/my/mysql-5.0-cleanjimw@mysql.com2006-04-302-2/+60
|\ \ \ | |/ / | | / | |/ |/| into mysql.com:/home/jimw/my/mysql-5.1-clean
| * Bug#19362 im_daemon_lifecycle fails when built from source distributionmsvensson@neptunus.(none)2006-04-262-3/+61
| | | | | | | | | | | | - 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
* | Bug #19059: Failure to get version information when running from source treejimw@mysql.com2006-04-172-4/+4
| | | | | | | | | | | | | | | | | | | | | | 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).
* | Merge bk-internal:/home/bk/mysql-5.1-newjimw@mysql.com2006-04-121-32/+39
|\ \ | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-clean
| * | 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
| | | | | | | | a normal 'make dist' source .tar.gz.
View Lorry Controller Status