summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Made the changes as per Kent/wlad to include ↵sunanda2010-06-231-1/+1
| | | | http://lists.mysql.com/commits/111802
* Auto-merge from mysql-trunk-bugfixing.Alexander Nozdrin2010-06-22290-2858/+7517
|\
| * Post-push fixups for WL#5349Magne Mahre2010-06-222-2/+3
| | | | | | | | | | | | | | mysql-test/suite/perfschema/t/no_threads-master.opt: Innodb will start multiple threads, which is not compatible with --one-thread. Disable innodb to be able to run the test case.
| * Auto-merge from mysql-trunk-stage.Alexander Nozdrin2010-06-2138-275/+1301
| |\
| | * Fixed a readability optimization in CMake code that broke IPv6 support.Daniel Fischer2010-06-211-2/+10
| | |
| | * mergeDaniel Fischer2010-06-1838-276/+1294
| | |\
| | | * post-merge fix 1Daniel Fischer2010-05-282-14/+1
| | | |
| | | * mergeDaniel Fischer2010-05-2713-272/+302
| | | |\
| | | | * Split OEL/RHELJonathan Perkin2010-05-271-23/+42
| | | | |
| | | | * configure.cmakeKent Boortz2010-05-252-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Reverted a faulty change of MY_SEARCH_LIBS - Added the proper change for MY_SEARCH_LIBS and HAVE_<libname>
| | | | * Get rid ot the "net retry count" difference whichJoerg Bruehe2010-05-212-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is not needed any more with current versions of FreeBSD. (Entries 52410 and 52412 in the Bug DB) That change is based on Dan Nelson replying on the FreeBSD mailing list, freebsd-questions@freebsd.org in a thread running from 2010-Apr-29 to 2010-May-1 titled "Need info about FreeBSD and interrupted system calls for MySQL code" Also, ensure the cmake settings correspond to the autotools ones: Add "HAVE_BROKEN_REALPATH" to cmake. cmake/os/FreeBSD.cmake: With current versions of FreeBSD, threading is not done on the user-level any more, so the huge "net retry count" is not needed any more. However, it is still being kept for now, so that it can be re-activated should the need arise. In addition, set "HAVE_BROKEN_REALPATH" to completely mirrot the autotools path. configure.in: With current versions of FreeBSD, threading is not done on the user-level any more, so the huge "net retry count" is not needed any more. However, it is still being kept for now, so that it can be re-activated should the need arise. Adapt the informational messages to the path taken.
| | | | * config.h.cmakeKent Boortz2010-05-212-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Set SIZEOF_VOIDP the same way as others - Unindent the no Mac OS settings, to let the checker scripts find the lines - Removed duplicate SIZEOF_SIZE_T setting - Added missing value for HAVE_CHARSET_ascii configure.cmake - Added HAVE_ prefix to library names, like HAVE_LIBM - Set HAVE_CXXABI_H if header is found, HAVE_ABI_CXA_DEMANGLE controls if useful - Set SIZEOF_VOIDP the same way as others
| | | | * config.h.cmakeKent Boortz2010-05-182-131/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added missing HAVE_SYS_TIMES_H, HAVE_SYS_TIME_H, HAVE_TIME_H, HAVE_TIME and HAVE_TIMES - Removed most #if constructs, keep logic in "configure.cmake" - Use space after # if inside #if, for consistency configure.cmake - Added MY_CHECK_TYPE_SIZE function that sets both SIZEOF_* and HAVE_* - If "sys/stream.h" exists, include it before "sys/ptem.h" in test - Set VOID_SIGHANDLER if RETSIGTYPE is set to "void"
| | | | * Null commit to test changes.Jonathan Perkin2010-05-140-0/+0
| | | | |
| | | | * Pointless commit to avoid unnecessary diffs and to trigger a new buildJonathan Perkin2010-05-121-1/+1
| | | | |
| | | | * Merge danny's Windows fix from release branchJonathan Perkin2010-05-112-4/+14
| | | | |\
| | | | * | Explicitly set OSX flags, to match current release.Jonathan Perkin2010-05-071-2/+2
| | | | | |
| | | | * | Tidy install layout.Jonathan Perkin2010-05-062-84/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove 'ROOT' from sql-bench dir variable, it's unnecessary.
| | | | * | Update commentJonathan Perkin2010-05-051-0/+5
| | | | | |
| | | | * | Try an ia64 fixJonathan Perkin2010-05-051-0/+3
| | | | | |
| | | | * | Output the config.h defines to stdoutKent Boortz2010-05-051-0/+2
| | | | | |
| | | | * | Add all pluginsJonathan Perkin2010-05-051-4/+8
| | | | | |
| | | | * | fix syntax errorJonathan Perkin2010-05-051-1/+1
| | | | | |
| | | | * | Build all plugins.Jonathan Perkin2010-05-055-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to fix ia64/icc builds.
| | | | * | Ok, let's try, one more timeJonathan Perkin2010-05-041-1/+1
| | | | | |
| | | | * | fixJonathan Perkin2010-05-041-1/+1
| | | | | |
| | | | * | Put back SELinux filesJonathan Perkin2010-05-041-0/+5
| | | | | |
| | | * | | WiX is worried that we aren't going to create these directories after all, ↵Daniel Fischer2010-04-301-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | so let's reaffirm our intention to do so.
| | | * | | apply wlad's patch to read the fill_help_tables.sql file whole, not line by lineDaniel Fischer2010-04-301-2/+3
| | | | | |
| | | * | | post-merge fixDaniel Fischer2010-04-301-2/+2
| | | | | |
| | | * | | mergeDaniel Fischer2010-04-308-27/+61
| | | |\ \ \ | | | | |/ /
| | | | * | Rebrand Red Hat as 'Enterprise Linux'Jonathan Perkin2010-04-291-10/+10
| | | | | |
| | | | * | Do not include Comments, as3ap or exampleBjorn Munch2010-04-291-2/+1
| | | | | |
| | | | * | Sync icc flags with reality.Jonathan Perkin2010-04-281-2/+2
| | | | | |
| | | | * | Revert the RPM naming change, we know it works, and can apply itJonathan Perkin2010-04-281-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to a later release.
| | | | * | Do not install mysql-test/lib/tBjorn Munch2010-04-281-0/+1
| | | | | |
| | | | * | fix man bootstrapJonathan Perkin2010-04-281-1/+3
| | | | | |
| | | | * | Try to fix the manual again, and a kent changeJonathan Perkin2010-04-282-2/+2
| | | | | |
| | | | * | Exclude "mysql_embedded" from being installed or part of a binaryKent Boortz2010-04-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | package, is more of a linktest of the embedded library.
| | | | * | On Mac OS X, add the "-arch" option to the 'mysql_config' outputKent Boortz2010-04-271-0/+4
| | | | | |
| | | | * | syntaxJonathan Perkin2010-04-271-1/+1
| | | | | |
| | | | * | Try againJonathan Perkin2010-04-271-3/+2
| | | | | |
| | | | * | Try to exclude make_win_bin_dist.1Jonathan Perkin2010-04-272-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build full debug release in RPMs so we can include bits we need.
| | | | * | Avoid __os_install_post RHEL5 bug by redefining __strip.Jonathan Perkin2010-04-271-0/+4
| | | | | |
| | | | * | Try removing debuginfo altogether.Jonathan Perkin2010-04-261-8/+2
| | | | | |
| | | | * | Try new RPM layout.Jonathan Perkin2010-04-262-32/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix libmysqlclient_r symlinks.
| | | | * | Remove duplicates.Jonathan Perkin2010-04-261-2/+4
| | | | | |
| | | | * | Try to fix libmysqlclient symlinks on per-OS basis.Jonathan Perkin2010-04-261-3/+10
| | | | | |
| | | * | | Changes to MSI installer:Daniel Fischer2010-04-309-111/+412
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Introduce MANUFACTURER setting to set package manufacturer via CMake. - Introduce COMMUNITY_BUILD setting to be passed on to packaging (not used here, but required for our own packages to determine what added files should be included in the package). - Create an RTF version of the COPYING text file and use that as the default license (can be overridden by providing a COPYING.rtf file). - Allow passing extra arguments to candle and light via environment. (Need -sval in pushbuild, but want validation elsewhere.) - Introduce a custom action that stops and uninstalls the service if the user installed one that points into the MySQL directory that is being removed. (Our own packages historically used the instance configuration wizard for this, but it wouldn't be very nice if MSIs created by our users couldn't remove it too.) - Make install location configurable again ("Browse" button in custom installation was greyed out before). - Remove registry keys that use "MySQL AB"; they should only be set in packages provided by us. Users can set their own registry keys if they want to.
| | | * | | mergeDaniel Fischer2010-04-234-50/+129
| | | |\ \ \
View Lorry Controller Status