summaryrefslogtreecommitdiff
path: root/support-files
Commit message (Collapse)AuthorAgeFilesLines
* mysql-5.5 mergeSergei Golubchik2012-01-161-2/+5
|\
| * Merge the changes of 5.5.17 back into main 5.5Joerg Bruehe2011-10-191-2/+5
| |\
| | * Fix the spec file: Files must not be mentioned twice in a "%files" list.Joerg Bruehe2011-09-281-2/+5
| | |
* | | 5.3 mergeSergei Golubchik2012-01-131-0/+1
|\ \ \
| * \ \ Merge with 5.2.Michael Widenius2011-12-117-33/+151
| |\ \ \ | | | | | | | | | | | | | | | no_error handling for select (used by INSERT ... SELECT) still needs to be fixed, but I will do that in a separate commit
| | * \ \ Merge with 5.1 + fixes for build failures in 5.2Michael Widenius2011-11-291-0/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmd-line-utils/libedit/map.c: Fixed compiler warning cmd-line-utils/libedit/terminal.c: Fixed compiler warning cmd-line-utils/libedit/tty.c: Fixed compiler warning sql/sql_base.cc: Fixed memory leak found by valgrind storage/maria/compat_aliases.cc: Ensure that recover_alias is also a set storage/maria/ma_bitmap.c: Proper fix for compiler warning support-files/compiler_warnings.supp: Fixed compiler warning
| | * \ \ \ Merge with MariaDB 5.1Michael Widenius2011-11-246-33/+150
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge with MySQL 5.1.60Michael Widenius2011-11-231-22/+51
| | | |\ \ \
| | | * \ \ \ Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-216-11/+99
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed up copyright messages.
* | | | \ \ \ \ mysql-5.5.18 mergeSergei Golubchik2011-11-0314-108/+388
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge to main.Joerg Bruehe2011-10-041-27/+54
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Fix bug#11886309: RPM UPGRADE OF MYSQL ADVANCED GPL TO MYSQL SERVER ADVANCED ↵Joerg Bruehe2011-10-041-27/+54
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DOES NOT WORK Upmerge from 5.1 to 5.5
| | | * | | | | Fix bug#11886309: RPM UPGRADE OF MYSQL ADVANCED GPL TO MYSQL SERVER ADVANCED ↵Joerg Bruehe2011-10-041-22/+51
| | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DOES NOT WORK Change the RPM spec file so that each RPM "obsoletes" the corresponding RPMs of all (other) configurations, so a "server" RPM of any configuration can replace the "server" RPM of any other configuration on a "rpm -U".
| * | | | | | merge from 5.5.16Daniel Fischer2011-09-211-23/+11
| |\ \ \ \ \ \
| | * | | | | | add mysql_plugin man page to spec fileDaniel Fischer2011-09-081-0/+5
| | | | | | | |
| | * | | | | | Cherry-picking WL#5710 from mysql-5.5 to mysql-5.5.16-release.Alexander Nozdrin2011-08-151-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original revision id: # revno: 3489 [merge] # revision-id: tatjana.nuernberg@oracle.com-20110811120945-c6x9a5d2du8s9oj2 # parent: tatjana.nuernberg@oracle.com-20110811112736-so8r813hs8dmf7nr # parent: chuck.bell@oracle.com-20110810183949-2s9uxcuoux2p668e # committer: Tatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com> # branch nick: 55-9 # timestamp: Thu 2011-08-11 13:09:45 +0100 # message: # auto-merge This merge revision also has a patch for Bug 12664445, which has been also taken to 5.5.16.
| | * | | | | | Source plugin library files list from cmake-generated file in RPM buildsDaniel Fischer2011-08-151-23/+5
| | | | | | | |
| * | | | | | | Update email address for Release Engineering.Jonathan Perkin2011-09-201-1/+1
| | | | | | | |
| * | | | | | | Don't use macro names in changelog comments.Jonathan Perkin2011-09-191-3/+3
| | |/ / / / / | |/| | | | |
| * | | | | | Complete support for OL/RH6.Jonathan Perkin2011-09-131-21/+26
| | | | | | |
| * | | | | | Bug #58241Joerg Bruehe2011-09-131-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Please exclude make_binary_distribution from the distribution With cmake (5.5 and up), "make package" will do it, or cpack. The (generated) "scripts/make_binary_distribution" is just a wrapper around a "cpack" call, with path names set at build time. Similar, "make_win_bin_dist" is not needed any more. scripts/CMakeLists.txt: Cleanup: Append a trailing newline when generating "make_binary_distribution" (which is just a wrapper around a "cpack" call). support-files/mysql.spec.sh: "make_win_bin_dist" is removed from the sources, so its man page is gone, and it need not be removed when creating the RPMs.
| * | | | | | Fix typos in last.Jonathan Perkin2011-09-121-2/+2
| | | | | | |
| * | | | | | Add support for RHEL6 and OL6.Jonathan Perkin2011-09-121-27/+46
| | | | | | |
| * | | | | | Add the manual page for "mysql_plugin" to the server RPM.Joerg Bruehe2011-08-301-1/+6
| | | | | | |
| * | | | | | Null-upmerge the bug#37165 fix: No functional change,Joerg Bruehe2011-08-191-2/+7
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | but some notation improvement is applicable.
| | * | | | | Fix bug#37165 "((Generic rpm)) fail to install on Fedora 9 x86_64"Joerg Bruehe2011-08-191-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Fedora, certain accesses to "/var/lib/mysql/HOSTNAME.err" were blocked by SELinux policy, this made the server start fail with the message Manager of pid-file quit without updating file Calling "/sbin/restorecon -R /var/lib/mysql" fixes this.
| * | | | | | WL#5710 : enable and disable pluginsChuck Bell2011-08-101-4/+9
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | Merge with main prior to pushing to mysql-5.5.
| | * | | | | fixing BUG 11759958 - 52319: MYSQL RHEL5 RPMS DO NOT REQUIRE NET-TOOLSunknown2011-08-061-4/+4
| | | | | | |
| | * | | | | Bug #12561297: Added the MySQL embedded binarySunanda Menon2011-07-221-0/+5
| | | | | | |
| * | | | | | WL#5710: enable and disable pluginsChuck Bell2011-07-251-0/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch corrects a problem found in pushbuild with the stat() method on some platforms. The code was changed to use my_stat() instead. Also adds mysql_plugin to the mysql.spec.sh file for packaging.
| * | | | | Upmerge the 45415 fix from 5.1 to 5.5Joerg Bruehe2011-07-071-3/+14
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix bug#45415: "rpm upgrade recreates test database"Joerg Bruehe2011-07-071-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let the creation of the "test" database happen only during a new installation, not in an RPM upgrade.
| * | | | | Updated/added copyright headersKent Boortz2011-06-3014-1/+206
| |\ \ \ \ \ | | |/ / / /
| | * | | | Updated/added copyright headersKent Boortz2011-06-306-8/+68
| | |\ \ \ \
| | | * | | | Updated/added copyright headersKent Boortz2011-06-301-3/+4
| | | | | | |
* | | | | | | merge with 5.3Sergei Golubchik2011-10-195-61/+83
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_insert.cc: CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. ****** CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. sql/sql_table.cc: small cleanup ****** small cleanup
| * | | | | | Added mytop to distribution (with some small trivial changes to make it ↵Michael Widenius2011-06-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | workg good also for MariaDB) scripts/CMakeLists.txt: Added mytop scripts/Makefile.am: Added mytop scripts/make_binary_distribution.sh: Added mytop scripts/make_win_bin_dist: Added mytop scripts/mytop.sh: Added mytop (with some small trivial changes to make it workg good also for MariaDB) support-files/mysql.spec.sh: Added mytop
| * | | | | | Merge with 5.2Michael Widenius2011-05-161-0/+7
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Made test-unit run in parlallel. This was achived by having all aria tests ↵Michael Widenius2011-05-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that uses temporary files to create the temporary file in an unique tempdirectory. aria_chk now returns 1 if one got any warnings during check and 2 if one got errors. lp:728919 maria_chk should fail on all detected corruptions mysql-test/lib/My/SafeProcess.pm: Removed ^M lines from the file storage/maria/ma_check.c: Fixed indentation storage/maria/maria_chk.c: aria_chk now returns 1 if one got any warnings during check and 2 if one got errors. storage/maria/unittest/ma_control_file-t.c: Use unique sub directory for test results storage/maria/unittest/ma_maria_log_cleanup.c: Added help function create_tmpdir() storage/maria/unittest/ma_pagecache_consist.c: Use unique sub directory for test results storage/maria/unittest/ma_pagecache_rwconsist.c: Use unique sub directory for test results storage/maria/unittest/ma_pagecache_rwconsist2.c: Use unique sub directory for test results storage/maria/unittest/ma_pagecache_single.c: Use unique sub directory for test results storage/maria/unittest/ma_test_all-t: Use unique sub directory for test results storage/maria/unittest/ma_test_loghandler-t.c: Use unique sub directory for test results storage/maria/unittest/ma_test_loghandler_first_lsn-t.c: Use unique sub directory for test results remove delete of files that are already deleted by maria_log_remove() storage/maria/unittest/ma_test_loghandler_max_lsn-t.c: Use unique sub directory for test results storage/maria/unittest/ma_test_loghandler_multigroup-t.c: Use unique sub directory for test results storage/maria/unittest/ma_test_loghandler_multithread-t.c: Use unique sub directory for test results storage/maria/unittest/ma_test_loghandler_noflush-t.c: Use unique sub directory for test results remove delete of files that are already deleted by maria_log_remove() storage/maria/unittest/ma_test_loghandler_nologs-t.c: Use unique sub directory for test results storage/maria/unittest/ma_test_loghandler_pagecache-t.c: Use unique sub directory for test results remove delete of files that are already deleted by maria_log_remove() storage/maria/unittest/ma_test_loghandler_purge-t.c: Use unique sub directory for test results support-files/compiler_warnings.supp: Supress some warnings unittest/unit.pl: Run 4 unittests in parallel
| * | | | | | Merge with dynamic column codeMichael Widenius2011-05-121-1/+7
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fixed compiler warnings and test cases problems found by buildbotMichael Widenius2011-05-111-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/dyncol.result: Updated test results mysql-test/r/index_intersect.result: Updated results mysql-test/r/index_intersect_innodb.result: Updated results mysql-test/t/dyncol.test: Added replace_result for floating point results that are different on windows Added round() around a result to get same result on all platforms. mysql-test/t/index_intersect.test: Added replace_result to fix that index_merge may put key names in different order. mysys/ma_dyncol.c: Fixed compiler warnings on Solaris sql/key.cc: Fixed compiler warnings on Solaris sql/mysqld.cc: Fixed compiler warning on windows support-files/compiler_warnings.supp: Suppressed an unintersting warning on Solaris
| * | | | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-10/+53
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-10/+53
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | Moved some BSD string functions from Unireg
| * | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-2819-505/+136
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge with MySQL 5.1.55Michael Widenius2011-02-2019-505/+136
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed some issues with partitions and connection_string, which also fixed lp:716890 "Pre- and post-recovery crash in Aria" - Fixed wrong assert in Aria Now need to merge with latest xtradb before pushing sql/ha_partition.cc: Ensure that m_ordered_rec_buffer is not freed before close. sql/mysqld.cc: Changed to use opt_stack_trace instead of opt_pstack. Removed references to pstack sql/partition_element.h: Ensure that connect_string is initialized storage/maria/ma_key_recover.c: Fixed wrong assert
| * | \ \ \ \ merge with 5.1Michael Widenius2010-11-302-6/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fixed compiler and gmake warningsMichael Widenius2010-11-292-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed SCCS rule from Makefile.am - Made dummy rule in sql_yacc.yy to get rid of compiler warning about not used label. Don't use maintainer mode with valgrind (as we don't want to initialize all variables) config/ac-macros/maintainer.m4: Don't use maintainer mode with valgrind (as we don't want to initialize all variables) Force initialization of variables when using -Werror (To get rid of compiler warnings) configure.in: Don't use maintainer mode with valgrind (as we don't want to initialize all variables) sql/sql_yacc.yy: Made dummy rule in sql_yacc.yy to get rid of compiler warning about not used label.
* | | | | | | 5.5-mergeSergei Golubchik2011-07-0236-671/+360
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge bug fix 42969 into main 5.5 branch.Joerg Bruehe2011-02-141-1/+6
| |\ \ \ \ \ \
| | * | | | | | Fix bug#42969 Please add a MANIFEST to each buildJoerg Bruehe2011-02-111-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change, there will be new files "INFO_SRC" and "INFO_BIN", which describe the source and the binaries. They will be contained in all packages: - in "tar.gz" and derived packages, in "docs/", - in RPMs, in "/usr/share/doc/packages/MySQL-server". "INFO_SRC" is also part of a source tarball. It gives the version as exact as possible, preferably by calling "bzr version-info" on the source tree. If that is not possible, it just contains the three level version number. "INFO_BIN" contains some info when and where the binaries were built, the options given to the compiler, and the flags controlling the included features. The tests (test "mysql" in the main suite) are extended to verify the existence of both "INFO_SRC" and "INFO_BIN", as well as some of the expected contents. CMakeLists.txt: For the new files describing the source and the build ("INFO_SRC" and "INFO_BIN"), we need a new file "cmake/info_macros.cmake.in" with the build rules. 1) This file must be configured with the current variables. 2) "INFO_SRC" can be created during the cmake phase, but this should be repeated with each "make" to protect against a developer doing only "make" after a "bzr pull" (or "bzr commit"). So have it both as a cmake rule and as a custom target. 3) "INFO_BIN" must be created during the make phase only, because it contains information from files which will be written at the end of the cmake phase only. Therefore, it must be a custom target which is included in all "make" targets. 4) The resulting "INFO_*" files must be included in packages. cmake/info_bin.cmake: This is the file to create "INFO_BIN", by calling the "CREATE_INFO_BIN()" macro. It must be a separate file, so that the macro definitions can be included in other cmake scripts without that file inclusion causing a side effect, the macro call. That call would modify the source tree which should be trated read-only. cmake/info_macros.cmake.in: This new file contains the macros to create the "INFO_*" files during various steps of the build, the calls will be at other places. 1) For source: If running from a BZR tree, always create (update) "INFO_SRC" by running "bzr version-info". Outside a BZR tree, try to take it from exported sources, and create it only if missing, in that case put the three level version number into it. 2) "INFO_BIN" contains - date/time and host name of the build host, - information about the platform, - information about the C and CXX compiler and the options given to them (Unix only), - the feature flags as reported by "cmake -L". cmake/info_src.cmake: This is the file to create "INFO_SRC", by calling the "CREATE_INFO_SRC()" macro. It must be a separate file, so that the macro definitions can be included in other cmake scripts without that file inclusion causing a side effect, the macro call. That call would modify the source tree which should be trated read-only. cmake/make_dist.cmake.in: Create a "VERSION_src" file during "make dist". In case it already exists from a preceding "cmake" run or tree export (which is quite likely), a new "make dist" must not modify it. mysql-test/r/file_contents.result: Result of test for bug#42969. mysql-test/t/file_contents.test: Perl test scriptlet for bug#42969. support-files/mysql.spec.sh: Add "INFO_SRC" and "INFO_BIN" to the RPM contents.
View Lorry Controller Status