summaryrefslogtreecommitdiff
path: root/extra
Commit message (Collapse)AuthorAgeFilesLines
* Auto-merge from mysql-5.5.Alexander Nozdrin2010-08-163-7/+6
|\
| * Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect).Alexander Nozdrin2010-08-123-7/+6
| | | | | | Fixing copyright text.
* | Auto-merge from mysql-5.5.Alexander Nozdrin2010-08-044-7/+14
|\ \ | |/
| * Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-07-292-18/+8
| |\
| * | Cleanup after bild team push.Vladislav Vaintroub2010-07-252-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed obvious errors (HAVE_BROKEN_PREAD is not true for on any of systems we use, definitely not on HPUX) * Remove other junk flags for OSX and HPUX * Avoid checking type sizes in universal builds on OSX, again (CMake2.8.0 fails is different architectures return different results) * Do not compile template instantiation stuff unless EXPLICIT_TEMPLATE_INSTANTIATION is used. * Some cleanup (make gen_lex_hash simpler, avoid dependencies) * Exclude some unused files from compilation (strtol.c etc)
| * | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-3/+3
| | | | | | | | | Remove unused macros or macro which are always defined.
| * | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-232-2/+0
| | | | | | | | | | | | Remove the ancient and dead raid code. By now, even the server side has been removed.
* | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-291-1/+1
|\ \ \ | |_|/ |/| |
| * | Bug#53463: YaSSL patch appears to be revertedDavi Arnaut2010-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The problem is that the fix Bug#29784 was mistakenly reverted when updating YaSSL to a newer version. The solution is to re-apply the fix and this time actually add a meaningful test case so that possible regressions are caught.
* | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-202-18/+8
|\ \ \ | |/ / | | / | |/ |/|
| * Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-202-18/+8
| | | | | | | | | | | | Fix warnings flagged by the new warning option -Wunused-but-set-variable that was added to GCC 4.6 and that is enabled by -Wunused and -Wall. The option causes a warning whenever a local variable is assigned to but is later unused. It also warns about meaningless pointer dereferences.
* | Manual merge from mysql-trunk.Alexander Nozdrin2010-07-192-1/+2
|\ \ | | | | | | | | | Conflicts: - scripts/CMakeLists.txt
| * | CMakeLists.txtKent Boortz2010-06-232-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmake/build_configurations/mysql_release.cmake - Corrected spelling ENABLE_LOCAL_INFILE => ENABLED_LOCAL_INFILE - In addition to "RelWithDebInfo", set target "Release" and "Debug" - Set Debug flags - Enabled SSL on Mac OS X - For gcc builds, set RELEASE and DEBUG flags as well - For g++ builds, added "-fno-implicit-templates" - Use "-O" (gcc -O1) for optimized binaries, as "DEBUG" in out case is more about enabling trace support to the server, no optimization makes binaries too slow to be practical to reproduce problems cmake/os/WindowsCache.cmake - Removed unused HAVE_SYS_IOCTL config.h.cmake - Added header checks and missing defines - Removed unused HAVE_SYS_IOCTL - Grouped and uncommented some HAVE_* that are really not defines, but internal variables used in the CMake setup, - Added hard coded flags for HP-UX and Mac OS X configure.cmake - Added header checks and missing defines - Removed unused HAVE_SYS_IOCTL - "sys/dir.h" test needs "sys/types.h" - Corrected syntax for "sys/ptem.h" test - Don't exclude test for some types if Mac OS X, harmless to do the test and we want the HAVE_<type> settings - Added hard coded flags for HP-UX and Mac OS X extra/yassl/CMakeLists.txt extra/yassl/taocrypt/CMakeLists.txt - Added missing source file "template_instnt.cpp"
* | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge.Davi Arnaut2010-07-1512-127/+30
|\ \ \
| * | | WL#5486: Remove code for unsupported platformsDavi Arnaut2010-07-151-1/+1
| | | | | | | | | | | | Remove QNX specific code.
| * | | WL#5486: Remove code for unsupported platformsDavi Arnaut2010-07-159-102/+5
| | | | | | | | | | | | Remove Netware specific code.
| * | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-083-24/+24
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Essentially, the problem is that safemalloc is excruciatingly slow as it checks all allocated blocks for overrun at each memory management primitive, yielding a almost exponential slowdown for the memory management functions (malloc, realloc, free). The overrun check basically consists of verifying some bytes of a block for certain magic keys, which catches some simple forms of overrun. Another minor problem is violation of aliasing rules and that its own internal list of blocks is prone to corruption. Another issue with safemalloc is rather the maintenance cost as the tool has a significant impact on the server code. Given the magnitude of memory debuggers available nowadays, especially those that are provided with the platform malloc implementation, maintenance of a in-house and largely obsolete memory debugger becomes a burden that is not worth the effort due to its slowness and lack of support for detecting more common forms of heap corruption. Since there are third-party tools that can provide the same functionality at a lower or comparable performance cost, the solution is to simply remove safemalloc. Third-party tools can provide the same functionality at a lower or comparable performance cost. The removal of safemalloc also allows a simplification of the malloc wrappers, removing quite a bit of kludge: redefinition of my_malloc, my_free and the removal of the unused second argument of my_free. Since free() always check whether the supplied pointer is null, redudant checks are also removed. Also, this patch adds unit testing for my_malloc and moves my_realloc implementation into the same file as the other memory allocation primitives.
* | | Unset the execute bit where it's not needed.Davi Arnaut2010-07-033-0/+0
| | |
* | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-0212-57/+63
|\ \ \ | |/ / |/| / | |/
| * Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-0212-57/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apart strict-aliasing warnings, fix the remaining warnings generated by GCC 4.4.4 -Wall and -Wextra flags. One major source of warnings was the in-house function my_bcmp which (unconventionally) took pointers to unsigned characters as the byte sequences to be compared. Since my_bcmp and bcmp are deprecated functions whose only difference with memcmp is the return value, every use of the function is replaced with memcmp as the special return value wasn't actually being used by any caller. There were also various other warnings, mostly due to type mismatches, missing return values, missing prototypes, dead code (unreachable) and ignored return values.
* | mergeDaniel Fischer2010-06-181-0/+2
|\ \
| * \ MergeDaniel Fischer2010-04-216-7/+81
| |\ \
| * | | Add components to INSTALL, some eraly Wix supportVladislav Vaintroub2010-02-101-0/+2
| | | |
* | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-106-38/+41
|\ \ \ \ | | |_|/ | |/| |
| * | | Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-06-106-38/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strict aliasing violations. Essentially, the problem is that large parts of the server were developed in simpler times (last decades, pre C99 standard) when strict aliasing and compilers supporting such optimizations were rare to non-existent. Thus, when compiling the server with a modern compiler that uses strict aliasing rules to perform optimizations, there are several places in the code that might trigger undefined behavior. As evinced by some recent bugs, GCC does a somewhat good of job misoptimizing such code, but on the other hand also gives warnings about suspicious code. One problem is that the warnings aren't always accurate, yet we can't afford to just shut them off as we might miss real cases. False-positive cases are aggravated mostly by casts that are likely to trigger undefined behavior. The solution is to start a cleanup process focused on fixing and reducing the amount of strict-aliasing related warnings produced by GCC and others compilers. A good deal of noise reduction can be achieved by just removing useless casts that are product of historical cruft and are likely to trigger undefined behavior if dereferenced.
* | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-091-1/+9
|\ \ \ \ | |/ / /
| * | | Merge of mysql-5.0-bugteam into mysql-5.1-bugteam.Davi Arnaut2010-06-091-1/+9
| |\ \ \
| | * | | Bug#34236: Various possibly related SSL crashesDavi Arnaut2010-06-091-1/+9
| | | | | | | | | | | | | | | | | | | | Addendum: Work around a compilation failure on Windows due to windows.h not being added to the global namespace.
* | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-0813-60/+61
|\ \ \ \ \ | |/ / / /
| * | | | Merge of mysql-5.0-bugteam into mysql-5.1-bugteam.Davi Arnaut2010-06-0815-61/+64
| |\ \ \ \ | | |/ / /
| | * | | Bug#34236: Various possibly related SSL crashesDavi Arnaut2010-06-0815-61/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that the bundled yaSSL library was being built without thread safety support regardless of the thread safeness of the compoments linked with it. The solution is to enable yaSSL thread safety support if any component (server or client) is to be built with thread support. Also, generate new certificates for yaSSL's test suite.
* | | | | Bug #53445 Build with -Wall and fix warnings that it generatesTor Didriksen2010-05-263-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Add -Wall to gcc/g++ Fix most warnings reported in dbg and opt mode.
* | | | | Another incarnation of the patch for Bug#30708Alexander Nozdrin2010-05-198-27/+0
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (make relies GNU extentions). The patch was partially backport from 6.0. Original comment: bug#30708: make relies GNU extensions. Now that we no longer use BitKeeper we can safely remove the SCCS handling with no loss of functionality.
* | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-243-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: - client/mysql.cc - client/mysqldump.c - configure.in - mysql-test/r/csv.result - mysql-test/r/func_time.result - mysql-test/r/show_check.result - mysql-test/r/sp-error.result - mysql-test/r/sp.result - mysql-test/r/sp_trans.result - mysql-test/r/type_blob.result - mysql-test/r/type_timestamp.result - mysql-test/r/warnings.result - mysql-test/suite/rpl/r/rpl_sp.result - sql/mysql_priv.h - sql/mysqld.cc - sql/sp.cc - sql/sql_base.cc - sql/sql_table.cc - sql/sql_trigger.cc - sql/sql_view.cc - sql/table.h - sql/share/errmsg.txt - mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.result
| * \ \ \ Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-02-233-3/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Text conflict in client/mysqltest.cc Text conflict in configure.in Text conflict in mysql-test/include/mtr_warnings.sql
| | * | | Bug #43414 Parenthesis (and other) warnings compiling Staale Smedseng2010-02-223-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | MySQL with gcc 4.3.2 This is the final patch in the context of this bug.
* | | | | Bug#10143 Perror not showing error descriptionMarc Alff2010-02-232-3/+77
| | | | | | | | | | | | | | | | | | | | Backport to 5.5.99
* | | | | Install extremely useful program "replace"Vladislav Vaintroub2010-02-191-1/+1
| |_|_|/ |/| | |
* | | | mergeVladislav Vaintroub2010-02-062-55/+69
|\ \ \ \
| * \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-192-55/+69
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: - configure.in - include/m_string.h - mysql-test/extra/rpl_tests/rpl_row_func003.test - mysql-test/r/mysqlbinlog.result - mysql-test/r/union.result - mysql-test/suite/binlog/r/binlog_killed_simulate.result - mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result - mysql-test/suite/binlog/r/binlog_unsafe.result - mysql-test/suite/binlog/t/binlog_unsafe.test - mysql-test/suite/rpl/r/rpl_loaddata_fatal.result - mysql-test/suite/rpl/r/rpl_loaddata_map.result - mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result - mysql-test/suite/rpl/r/rpl_stm_log.result - mysql-test/suite/rpl/t/rpl_optimize.test - mysql-test/t/mysqlbinlog.test - mysql-test/t/union.test - sql/rpl_utility.h - sql/sql_union.cc - strings/Makefile.am
| | * | | Manual merge from mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-152-55/+69
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Text conflict in .bzr-mysql/default.conf Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result Text conflict in mysql-test/t/mysqlbinlog.test Text conflict in sql/sql_acl.cc Text conflict in sql/sql_servers.cc Text conflict in sql/sql_update.cc Text conflict in support-files/mysql.spec.sh
| | | * | Auto-merge.Ramil Kalimullin2010-01-132-55/+69
| | | |\ \ | | | | |/
| | | | * Fix for bug#50227: Pre-auth buffer-overflow in mySQL through yaSSLRamil Kalimullin2010-01-132-55/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: copying issuer's (or subject's) name tags into an internal buffer from incoming stream we didn't check the buffer overflow. That may lead to memory overrun, crash etc. Fix: ensure we don't overrun the buffer. Note: there's no simple test case (exploit needed).
* | | | | Replace ADD_EXECUTABLE with MYSQL_ADD_EXECUTABLE for binaries that are ↵Vladislav Vaintroub2009-12-171-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installed. MYSQL_ADD_EXECUTABLE will instructs CPack where to install the exe. On Windows, it also adds version resource and if -DSIGNCODE was given, will sign the exe in packaging step.
* | | | | mergeVladislav Vaintroub2009-12-162-15/+7
|\ \ \ \ \ | |/ / / /
| * | | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-161-10/+0
| |\ \ \ \ | | |/ / /
| | * | | Remove .cvsignore files (attempt #2).Alexander Nozdrin2009-12-161-10/+0
| | | | |
| * | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-5/+7
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: - extra/comp_err.c - mysql-test/collections/default.experimental - mysql-test/r/archive.result - mysql-test/r/select.result - mysql-test/suite/binlog/r/binlog_unsafe.result - mysql-test/suite/binlog/t/binlog_unsafe.test - mysql-test/suite/rpl/t/disabled.def - mysql-test/t/archive.test - mysql-test/t/select.test - sql/item.cc - sql/item.h - sql/item_timefunc.cc - sql/sql_base.cc - sql/sql_delete.cc - sql/sql_load.cc - sql/sql_partition.cc - sql/sql_table.cc - storage/innobase/handler/ha_innodb.cc - vio/vio.c
| | * | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-114-13/+12
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: - client/mysqltest.cc - mysql-test/collections/default.experimental - mysql-test/suite/rpl/t/disabled.def - sql/mysqld.cc - sql/opt_range.cc - sql/sp.cc - sql/sql_acl.cc - sql/sql_partition.cc - sql/sql_table.cc
| | * | | mergeGeorgi Kodinov2009-11-201-5/+7
| | |\ \ \ | | | | |/ | | | |/|
View Lorry Controller Status