summaryrefslogtreecommitdiff
path: root/extra
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-2813-129/+327
|\
| * Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-10-251-2/+2
| | | | | | | | commented out the "compressed columns" feature
| * Merge branch '5.5' into 10.0Sergei Golubchik2016-10-2511-122/+274
| |\
| | * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-10-1311-122/+274
| | |\
| | | * Bug #24740291: YASSL UPDATE TO 2.4.2mysql-5.5.53Robert Golebiowski2016-09-2811-122/+274
| | | |
| | | * Bug#21977380 - POSSIBLE BUFFER OVERFLOW ISSUESShishir Jaiswal2016-05-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DESCRIPTION =========== Buffer overflow is reported in a lot of code sections spanning across server, client programs, Regex libraries etc. If not handled appropriately, they can cause abnormal behaviour. ANALYSIS ======== The reported casea are the ones which are likely to result in SEGFAULT, MEMORY LEAK etc. FIX === - sprintf() has been replaced by my_snprintf() to avoid buffer overflow. - my_free() is done after checking if the pointer isn't NULL already and setting it to NULL thereafter at few places. - Buffer is ensured to be large enough to hold the data. - 'unsigned int' (aka 'uint') is replaced with 'size_t' to avoid wraparound. - Memory is freed (if not done so) after its alloced and used. - Inserted assert() for size check in InnoDb memcached code (from 5.6 onwards) - Other minor changes
| * | | MDEV-11127 : Fix innochecksum to work with large files on Windows.Vladislav Vaintroub2016-10-251-5/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - don't use stat() for file size, it doesn not handle large size use GetFileSizeEx() instead - don't use lseek(), it can't handle large files, use _lseeki64() instead. - Also, switch off OS file buffering for innochecksum on Windows, to avoid thrashing file cache.
| * | | Upstream patch from Debian Bug 838557Kristian Nielsen2016-10-211-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | The patch fixes 128-bit multiply on mips64. This corrects a previous incorrect patch upstreamed from Debian.
* | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-241-1/+1
|\ \ \ \ | |/ / /
| * | | Fixed compiler error and some warnings on windowsMonty2016-08-231-1/+1
| | | |
* | | | Merge tag 'mariadb-10.0.26' into 10.0-galeraNirbhay Choubey2016-06-242-4/+6
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into bb-10.0Sergei Golubchik2016-06-212-4/+6
| |\ \ \ | | |/ /
| | * | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-06-141-2/+1
| | |\ \
| | | * | Bug#21977380 - POSSIBLE BUFFER OVERFLOW ISSUESShishir Jaiswal2016-05-161-2/+2
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DESCRIPTION =========== Buffer overflow is reported in a lot of code sections spanning across server, client programs, Regex libraries etc. If not handled appropriately, they can cause abnormal behaviour. ANALYSIS ======== The reported casea are the ones which are likely to result in SEGFAULT, MEMORY LEAK etc. FIX === - sprintf() has been replaced by my_snprintf() to avoid buffer overflow. - my_free() is done after checking if the pointer isn't NULL already and setting it to NULL thereafter at few places. - Buffer is ensured to be large enough to hold the data. - 'unsigned int' (aka 'uint') is replaced with 'size_t' to avoid wraparound. - Memory is freed (if not done so) after its alloced and used. - Inserted assert() for size check in InnoDb memcached code (from 5.6 onwards) - Other minor changes (cherry picked from commit 3487e20959c940cbd24429afa795ebfc8a01e94f)
| | * | MDEV-8012: Wrong exit code when asking for helpDan Ungureanu2016-06-121-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `--help` is a perfectly valid parameter and both `mysqladmin` and `mysql_waitpid` should exit with success (zero errror code). Signed-off-by: Vicențiu Ciorbaru <vicentiu@mariadb.org>
| | * | MDEV-8012: Wrong exit code when asking for helpVicențiu Ciorbaru2016-06-121-1/+1
| | | | | | | | | | | | | | | | Make mysql_waitpid return exit code 0 when -V flag is supplied.
* | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-2910-36/+86
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2016-04-269-34/+84
| |\ \ \ | | |/ /
| | * | Merge branch 'bb-5.5-serg' into 5.5mariadb-5.5.49Sergei Golubchik2016-04-209-28/+80
| | |\ \
| | | * \ Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-04-209-28/+80
| | | |\ \ | | | | |/
| | | | * Bug #22738607: YASSL FUNCTION X509_NAME_GET_INDEX_BY_NID IS NOT WORKING AS ↵mysql-5.5.49Yashwant Sahu2016-02-269-28/+80
| | | | | | | | | | | | | | | | | | | | EXPECTED.
| | * | | MDEV-9836 Connection lost when using SSLVladislav Vaintroub2016-04-201-4/+0
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't read from socket in yassl in SSL_pending(). Just return size of the buffered processed data. This is what OpenSSL is documented to do too: SSL_pending() returns the number of bytes which have been processed, buffered and are available inside ssl for immediate read.
| * | | Fix spelling: occurred, execute, which etcOtto Kekäläinen2016-03-041-2/+2
| | | |
* | | | Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-236-15/+40
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2016-02-156-15/+40
| |\ \ \ | | |/ /
| | * | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-02-096-15/+40
| | |\ \ | | | |/ | | | | | | | | | | | | reverted about half of commits as either not applicable or outright wrong
| | | * Description: yaSSL was only handling the cases of zero orV S Murthy Sidagam2016-01-046-15/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | one leading zeros for the key agreement instead of potentially any number. There is about 1 in 50,000 connections to fail when using DHE cipher suites. The second problem was the case where a server would send a public value shorter than the prime value, causing about 1 in 128 client connections to fail, and also caused the yaSSL client to read off the end of memory. All client side DHE cipher suite users should update. Note: The patch is received from YaSSL people
| | | * Updated yassl to yassl-2.3.8Robert Golebiowski2015-09-186-3/+31
| | | |
| | | * Bug #21025377 CAN'T CONNECT TO SSL ENABLED SERVER FIRST 30 SEC AFTERRobert Golebiowski2015-09-183-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | INITIAL STARTUP Updated yassl to yassl-2.3.7e
* | | | Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-191-43/+26
|\ \ \ \ | |/ / /
| * | | Fixes to get all test to run on MacosX Lion 10.7Monty2015-11-291-43/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes fixing all utilities to not have any memory leaks, as safemalloc warnings stopped tests from passing on MacOSX. - Ensure that all clients takes character-set-dir, as the libmysqlclient library will use it. - mysql-test-run now passes character-set-dir to all external clients. - Changed dynstr_free() so that it can be called twice (made freeing code easier) - Changed rpl_global_gtid_slave_state to be allocated dynamicly as it includes a mutex that needs to be initizlied/destroyed before my_end() is called. - Removed rpl_slave_state::init() and rpl_slave_stage::deinit() as their job are better handling by constructor and delete. - Print alias instead of table_name in check_duplicate_key as table_name may have been converted to lower case. Other things: - Fixed a case in time_to_datetime_with_warn() where we where using && instead of & in tests
* | | | Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-3111-7/+93
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-10-0911-7/+93
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'mysql/5.5' into 5.5Sergei Golubchik2015-10-0811-7/+93
| | |\ \
| | | * | Updated yassl to yassl-2.3.8mysql-5.5.46Robert Golebiowski2015-09-186-3/+31
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit 7f9941eab55ed672bfcccd382dafbdbcfdc75aaa)
| | | * | Bug #21025377 CAN'T CONNECT TO SSL ENABLED SERVER FIRST 30 SEC AFTERRobert Golebiowski2015-09-183-2/+9
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | INITIAL STARTUP Updated yassl to yassl-2.3.7e (cherry picked from commit 6e21c8c04b922bdb60b6a7c174709d2e1bdd3618)
| | | * Bug #20774956: THREAD_POOL.THREAD_POOL_CONNECT HANGS WHEN RUN ON ARobert Golebiowski2015-07-083-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | YASSL-COMPILED SERVER/CLIENT Description: thread_pool.thread_pool_connect hangs when the server and client are compiled with yaSSL. Bug-fix: Test thread_pool.thread_pool_connect was temporary disabled for yaSSL. However, now that yaSSL is fixed it runs OK. The bug was introduced by one of the yaSSL updates. set_current was not working for i == 0. Now this is fixed. YASSL is updated to 2.3.7d
| | | * Bug #21025377 CAN'T CONNECT TO SSL ENABLED SERVER FIRST 30 SEC AFTERRobert Golebiowski2015-07-083-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | INITIAL STARTUP Description: By using mysql_ssl_rsa_setup to get SSL enabled server (after running mysqld --initialize) server don't answer properly to "mysqladmin ping" first 30 secs after startup. Bug-fix: YASSL validated certificate date to the minute but should have to the second. This is why the ssl on the server side was not up right away after new certs were created with mysql_ssl_rsa_setup. The fix for that was submitted by Todd. YASSL was updated to 2.3.7c.
| | | * Bug #20168526 YASSL: CORRUPT SSL-KEY CRASHES CLIENTRobert Golebiowski2015-07-085-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Affects at least 5.6 and 5.7. In customer case, the "client" happened to be a replication slave, therefore his server crashed. Bug-fix: The bug was in yassl. Todd Ouska has provided us with the patch. (cherry picked from commit 42ffa91aad898b02f0793b669ffd04f5c178ce39)
* | | | Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-211-6/+3
|\ \ \ \ | |/ / /
| * | | MDEV-7398 mysqld segfaults on FreeBSD 10.1 i386 when built with clang 3.4Sergei Golubchik2015-06-161-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in cmake tests let's treat clang like gcc (same options, same builtins) in many cases. * don't check the compiler when * testing for -fvisibility=hidden support * testing for HAVE_ABI_CXA_DEMANGLE * testing for HAVE_GCC_ATOMIC_BUILTINS * when removing options with string(replace) * when running ${CC} --version (ignore the error instead) * run ABI checks for clang * use "canonical" gcc flags for clang * fix groonga too Also: * add cmake detection for gcc __atomic_* builtins. they might be supported (__ATOMIC_SEQ_CST is defined), but not for all operand sizes. In particular, 64-bit atomic load is problematic on i386 * cache check results for Windows * remove the test for HAVE_CXXABI_H (HAVE_ABI_CXA_DEMANGLE is suffifient)
* | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2015-02-1811-20/+342
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 10.0 till revision: f37bdd9 - Merge remote-tracking branch 'github/10.0' into 10.0 Conflicts: .bzrignore storage/xtradb/CMakeLists.txt
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-02-1811-20/+342
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42Sergei Golubchik2015-02-1111-20/+342
| | |\ \ | | | |/
| | | * Bug#20201864 : UPGRADE TO YASSL 2.3.7Harin Vadodaria2014-12-3011-20/+342
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrading YaSSL from 2.3.5 to 2.3.7 Reviewed-by : Kristofer Pettersson <kristofer.pettersson@oracle.com> Reviewed-by : Vamsikrishna Bhagi <vamsikrishna.bhagi@oracle.com>
| | | * Bug #16581605: REPLACE.EXE UTILITY IS BROKEN IN 5.5Arun Kuruvila2014-10-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Description:- Replace, the string replacement utility fails on the windows platform. Analysis:- The utility takes files and multiple string pairs as input. In the windows platform, the utility maps the standard input incorrectly (Considers 0 as the fd for standard input instead of 2048 on windows). Hence when the input file is supplied to the utility due to the incorrect mapping, a bad file descriptor error is generated causing the utility to exit with an error. Fix:- "my_fileno()" is used for getting the correct file despscriptor for standard input.
| | | * Bug#19695101 UPGRADE YASSL TO 2.3.5Kristofer Pettersson2014-09-293-2/+11
| | | |
| | | * Bug#19370676 : YASSL PRE-AUTH BUFFER OVERFLOW WHEN CLIENTHarin Vadodaria2014-08-2338-438/+717
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LIES ABOUT SUITE_LEN_ and Bug#19355577 : YASSL PRE-AUTH BUFFER OVERFLOW WHEN CLIENT LIES ABOUT COMP_LEN_ Description : Updating yaSSL to version 2.3.4.
| | | * Bug#17201924 and Bug#18178997 : YASSL:MISSING CLOSEDIR()Harin Vadodaria2014-05-222-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IN SSL_CTX_LOAD_VERIFY_ LOCATIONS() and OFF-BY-ONE PROBLEM IN VOID CERTDECODER:: GETDATE(DATETYPE DT) IN ASN.CPP Description : Fixes corner cases in yassl code. Refer to bug page for details.
| | | * Backport from trunk:Tor Didriksen2014-05-072-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#18187290 ISSUE WITH BUILDING MYSQL USING CMAKE 2.8.12 We want to upgrade to VS2013 on Windows. In order to do this, we need to upgrade to cmake 2.8.12 This has introduced some incompatibilities for .pdb files, and "make install" no longer works. To reproduce: cmake --build . --target package --config debug The fix: Rather than installing .pdb files for static libraries, we use the /Z7 flag to store symbolic debugging information in the .obj files.