summaryrefslogtreecommitdiff
path: root/extra
Commit message (Collapse)AuthorAgeFilesLines
* 5.5 mergeSergei Golubchik2014-05-0985-436/+871
|\
| * mysql-5.5.37 selective mergeSergei Golubchik2014-03-2785-427/+866
| |\
| | * Updated/added copyright header. Added line "use is subject to license terms" Murthy Narkedimilli2014-02-1757-0/+57
| | | | | | | | | | | | | | | to copyright header.
| | * Bug#14211271 ISSUES WITH SSL ON DEBIAN WHEEZY I386 AND KFREEBSD-I386Anirudh Mangipudi2014-02-0615-183/+294
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: It was reported that on Debian and KFreeBSD platforms, i386 architecture machines certain SSL tests are failing. main.ssl_connect rpl.rpl_heartbeat_ssl rpl.rpl_ssl1 rpl.rpl_ssl main.ssl_cipher, main.func_encrypt were the tests that were reportedly failing (crashing). The reason for the crashes are said to be due to the assembly code of yaSSL. Solution: There was initially a workaround suggested i.e., to enable -DTAOCRYPT_DISABLE_X86ASM flag which would prevent the crash, but at an expense of 4X reduction of speed. Since this was unacceptable, the fix was the functions using assembly, now input variables from the function call using extended inline assembly on GCC instead of relying on direct assembly code.
| | * Bug#16715064 MYSQL COMMUNITY UTILITIES CANNOT CONNECT TO MYSQL ENTERPRISEAnirudh Mangipudi2014-01-0816-237/+514
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WITH SSL ENABLED Problem: It was reported that MySQL community utilities cannot connect to a MySQL Enterprise 5.6.x server with SSL configured. We can reproduce the issue when we try to connect an MySQL Enterprise Server with a MySQL Client with --ssl-ca parameter enabled. We get an ERROR 2026 (HY000): SSL connection error: unknown error number. Solution: The root cause of the problem was determined to be the difference in handling of the certificates by OpenSSL(Enterprise) and yaSSL(Community). OpenSSL expects a blank certificate to be sent when a parameter (ssl-ca, or ssl-cert or ssl-key) has not been specified.On the other hand yaSSL doesn't send any certificate and since OpenSSL does not expect this behaviour it returns an Unknown SSL error. The issue was resolved by yaSSL adding capability to send blank certificate when any of the parameter is missing.
* | | Merge with 10.0-baseMichael Widenius2014-03-131-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Automatic merge, except for server_audit.cc that had to be modified slightly Changes to xtradb and innobase where ignored was these made no sence for 10.0
| * \ \ Merge with 5.5Michael Widenius2014-03-111-2/+2
| |\ \ \ | | |/ /
| | * | Fixed a compiler failure and removed some warnings in windowsMichael Widenius2014-03-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extra/replace.c: Removed compiler warning sql/unireg.cc: Removed compiler warning storage/maria/ma_blockrec.c: Removed compiler warning storage/maria/ma_dynrec.c: Fixed compiler failure storage/maria/ma_unique.c: Removed compiler warning storage/myisam/mi_check.c: Removed compiler warning storage/myisam/mi_checksum.c: Removed compiler warning
* | | | 10.0-base mergeSergei Golubchik2014-02-267-7/+7
|\ \ \ \ | |/ / /
| * | | 5.5 mergeSergei Golubchik2014-02-257-7/+7
| |\ \ \ | | |/ /
| | * | MySQL-5.5.36 mergeSergei Golubchik2014-02-177-7/+7
| | |\ \ | | | |/ | | | | | | | | (without few incorrect bugfixes and with 1250 files where only a copyright year was changed)
| | | * Updated/added copyright headersMurthy Narkedimilli2014-01-067-7/+7
| | | |
* | | | Automatic mergeMichael Widenius2014-02-056-39/+90
|\ \ \ \
| * | | | Fixes to get valgrind to work with jemallocMichael Widenius2014-01-026-39/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added MALLOC_LIBRARY variable to hold name of malloc library - Back ported valgrind related fixes from jemalloc 3.4.1 to the included jemalloc 3.3.1 - Renamed bitmap_init() and bitmap_free() to my_bitmap_init() and my_bitmap_free() to avoid clash with jemalloc 3.4.1 - Use option --soname-synonyms=somalloc=NON to valgrind when using jemalloc - Show version related variables in mysqld --help -- Added SHOW_VALUE_IN_HELP marker Increased back_log to 150 as the original value was a bit too small CMakeLists.txt: Added MALLOC_LIBRARY variable to hold name of malloc library cmake/jemalloc.cmake: Added MALLOC_LIBRARY variable to hold name of malloc library config.h.cmake: Added MALLOC_LIBRARY variable to hold name of malloc library extra/jemalloc/ChangeLog: Updates changelog extra/jemalloc/include/jemalloc/internal/arena.h: Backported valgrind fixes from jemalloc 3.4.1 extra/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in: Backported valgrind fixes from jemalloc 3.4.1 extra/jemalloc/include/jemalloc/internal/private_namespace.h: Backported valgrind fixes from jemalloc 3.4.1 extra/jemalloc/include/jemalloc/internal/tcache.h: Backported valgrind fixes from jemalloc 3.4.1 extra/jemalloc/src/arena.c: Backported valgrind fixes from jemalloc 3.4.1 include/my_bitmap.h: Renamed bitmap_init() and bitmap_free() to my_bitmap_init() and my_bitmap_free() to avoid clash with jemalloc 3.4.1 mysql-test/mysql-test-run.pl: Use option --soname-synonyms=somalloc=NON to valgrind when using jemalloc mysql-test/valgrind.supp: Supression of memory leak in OpenSuse 12.3 mysys/my_bitmap.c: Renamed bitmap_init() and bitmap_free() to my_bitmap_init() and my_bitmap_free() sql/ha_ndbcluster_binlog.cc: Renames sql/ha_ndbcluster_cond.h: Renames sql/ha_partition.cc: Renames sql/handler.cc: Renames sql/item_subselect.cc: Renames sql/log_event.cc: Renames sql/log_event_old.cc: Renames sql/mysqld.cc: Renames Show version related variables in mysqld --help sql/opt_range.cc: Renames sql/opt_table_elimination.cc: Renames sql/partition_info.cc: Renames sql/rpl_injector.h: Renames sql/set_var.h: Renames sql/slave.cc: Renames sql/sql_bitmap.h: Renames sql/sql_insert.cc: Renames sql/sql_lex.h: Renames sql/sql_parse.cc: Renames sql/sql_partition.cc: Renames sql/sql_select.cc: Renames sql/sql_show.cc: Renames sql/sql_update.cc: Renames sql/sys_vars.cc: Show version related variables in mysqld --help sql/sys_vars.h: Added SHOW_VALUE_IN_HELP marker for variables that should be shown in --help sql/table.cc: Renames sql/table.h: Removed not used bitmap_init_value storage/connect/ha_connect.cc: Removed compiler warning storage/maria/ma_open.c: Renames unittest/mysys/bitmap-t.c: Renames
* | | | | 10.0-base mergeSergei Golubchik2014-02-032-0/+10
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | 5.5 mergeSergei Golubchik2014-02-012-0/+10
| |\ \ \ | | |/ /
| | * | MySQL-5.5.35 mergeSergei Golubchik2014-01-222-0/+10
| | |\ \ | | | |/
| | | * Bug 13878021 - WINDOWS PACKAGE THAT INCLUDES .PDB FILES FOR INTERMEDIATE ↵Sreedhar.S2013-10-092-0/+10
| | | | | | | | | | | | | | | | LIBRARIES USED
* | | | 10.0-base mergeSergei Golubchik2013-12-161-1/+1
|\ \ \ \ | |/ / /
| * | | 5.5 mergeSergei Golubchik2013-12-151-1/+1
| |\ \ \ | | |/ /
| | * | Fixed compiler errors and warningsMichael Widenius2013-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extra/jemalloc/src/ctl.c: Fixed compiler warning include/mysql/service_logger.h: Fixed compile failure with clang compiler storage/maria/ma_check.c: Fixed compiler warning support-files/compiler_warnings.supp: Suppressed warnings in jemalloc tests/bug25714.c: Fixed compiler warning
* | | | 10.0-base merge.Sergei Golubchik2013-09-21101-2/+45845
|\ \ \ \ | |/ / / | | | | | | | | | | | | Partitioning/InnoDB changes are *not* merged (they'll come from 5.6) TokuDB does not compile (not updated to 10.0 SE API)
| * | | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-18101-2/+45845
| |\ \ \ | | |/ /
| | * | merge with 5.5-tokudb tree. In particular:Sergei Golubchik2013-09-10100-0/+45843
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add TokuDB, together with the ft-index library * cmake support, auto-detecting whether tokudb can be built * fix packaging - tokudb-engine.rpm, deb * remove PBXT * add jemalloc * the server is built with jemalloc by default even if TokuDB is not built * documentation files in RPM are installed in the correct location * support for optional deb packages (tokudb has specific build requirements) * move plugins from mariadb-server deb to appropriate debs (server/test/libmariadbclient) * correct mariadb-test.deb to be not architecture-independent * fix out-of-tree builds to never modify in-tree files * new handler::prepare_index_scan() method
| | | * | merge in git://github.com/Tokutek/jemallocSergei Golubchik2013-08-29100-0/+45843
| | | | |
| | * | | MDEV-4941 make: AIX fails with 'Identifier not allowed in cast'; syntax ↵Sergei Golubchik2013-09-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error in include/my_global.h C++ comments in C files, and a typo in my_global.h
| | * | | mysql-5.5.33 mergeSergei Golubchik2013-09-061-2/+2
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Merge from mysql-5.1 to mysql-5.5Jon Olav Hauglid2013-05-161-1/+19
| | | |\
| | | | * Bug#16807394: PREVENT NEW ERROR MESSAGES FROM BEING ADDED TO 5.5Jon Olav Hauglid2013-05-161-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to keep error message numbers stable between GA releases, we can not now add a new error message to 5.1/5.5 as this message would get a number now used in 5.6. This patch enforces this by adding a 5.1/5.5 specific check when processing the error message file. If a new error message is added, building will abort and report an error.
| | | | * Correcting the permissions of executable files.Murthy Narkedimilli2013-03-206-0/+0
| | | | |
| | | | * Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-1917-19/+19
| | | | |
* | | | | 10.0-monty mergeSergei Golubchik2013-07-212-4/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes: * remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING" * introduce LOCK_share, now LOCK_ha_data is strictly for engines * rea_create_table() always creates .par file (even in "frm-only" mode) * fix a 5.6 bug, temp file leak on dummy ALTER TABLE
| * | | | | Temporary commit of 10.0-mergeMichael Widenius2013-03-262-5/+8
| | | | | |
* | | | | | 10.0-base mergeSergei Golubchik2013-07-189-11/+11
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 5.5 mergeSergei Golubchik2013-07-179-11/+11
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | mysql-5.5.32 mergeSergei Golubchik2013-07-169-11/+11
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Correcting the permissions of the executable files.Murthy Narkedimilli2013-03-206-0/+0
| | | | | |
| | | * | | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-199-11/+11
| | | | | |
* | | | | | 10.0-base mergeSergei Golubchik2013-06-0671-103/+320
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | (without InnoDB - all InnoDB changes were ignored)
| * | | | | 5.5 mergeSergei Golubchik2013-06-0671-105/+320
| |\ \ \ \ \ | | |/ / / /
| | * | | | mysql-5.5.31 mergeSergei Golubchik2013-05-0773-107/+323
| | |\ \ \ \ | | | |/ / /
| | | * | | Updated/added copyright headersMurthy Narkedimilli2013-02-2672-84/+74
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Updated/added copyright headers.Murthy Narkedimilli2013-02-2577-89/+77
| | | | | |
| | | * | | Bug#16218104: MYSQL YASSL - LUCKY THIRTEEN: BREAKING THEHarin Vadodaria2013-02-155-25/+215
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | TLS AND DTLS RECORD PROTOCOLS Description: Merge from 5.1.
| | | | * | Bug#16218104: MYSQL YASSL - LUCKY THIRTEEN: BREAKING THEHarin Vadodaria2013-02-155-25/+215
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TLS AND DTLS RECORD PROTOCOLS Description: In yassl, decryption phase in TLS protocol depends on type of padding. This patch removes this dependancy and makes error generation/decryption process independent of padding type.
* | | | | | 10.0-base mergeSergei Golubchik2013-04-152-18/+38
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | 5.5 mergeSergei Golubchik2013-03-272-18/+38
| |\ \ \ \ | | |/ / /
| | * | | MDEV-4068 rpm scriptlet chown command dangerousSergei Golubchik2013-03-061-17/+31
| | | | | | | | | | | | | | | | | | | | | | | | | add --mysqld option to my_print_defaults change server-postin script to use that
| | * | | merge with mysql-5.5.30 minus few incorrect or not applicable changesetsSergei Golubchik2013-02-281-1/+7
| | |\ \ \ | | | |/ /
| | | * | Bug#15965288: BUFFER OVERFLOW IN YASSL FUNCTIONHarin Vadodaria2012-12-131-1/+7
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | DOPROCESSREPLY() Description: Merge from 5.1 to 5.5
View Lorry Controller Status