summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-7715 - Spiral patch 017_mariadb-10.0.15.get_error_at_commit.diffbb-mdev7715Sergey Vojtovich2015-03-191-8/+17
| | | | | | Let open_ltable() rollback statement only if it failed to lock transactional table. This allows spider to safely open non-transactional system tables during commit.
* Introduce two debug crash points while writing crypt data to testJan Lindström2015-03-192-0/+12
| | | | redo operations.
* MDEV-7661 Unexpected result for: CAST(0xHHHH AS CHAR CHARACTER SET xxx)Alexander Barkov2015-03-1831-121/+1805
| | | | for incorrect byte sequences
* Fixed innodb and innodb_bug59641 failures on PPC64.Sergey Vojtovich2015-03-183-2/+3
| | | | | | | | innodb_buffer_pool_pages_total depends on page size. On Power8 it is 65k compared to 4k on Intel. As we round allocations on page size we may get slightly more memory for buffer pool. Sort XA RECOVER as rows order depend on endianness.
* Replace static usage of AES_CTR with current encryption algorithm.Jan Lindström2015-03-171-1/+9
|
* Installation fix.Alexey Botchkov2015-03-171-0/+2
|
* MDEV-7515 GIS: No AddGeometryColumn or DropGeometryColumn in the tree.Alexey Botchkov2015-03-174-4/+79
| | | | Installation scripts added to setup the required SP-s with the mysql_install_db.
* Test result fixed.Alexey Botchkov2015-03-171-0/+772
|
* Merge MDEV-6981 and MDEV-6981 (from danblack) into MariaDB 10.1Kristian Nielsen2015-03-1710-3/+109
|\
| * MDEV-6981: feature request MASTER_GTID_WAIT status variablesKristian Nielsen2015-03-161-0/+1
| | | | | | | | Missing .result file update.
| * Merge MDEV-7198: status variable for Slave_skipped_errorsKristian Nielsen2015-03-165-2/+17
| |\
| | * additional slave_skip_errors statusDaniel Black2015-03-162-0/+4
| | |
| | * Complete test for status slave_skipped_errorsDaniel Black2015-03-163-1/+4
| | |
| | * Add Slave_skipped_errors to global statusDaniel Black2015-03-124-2/+10
| | | | | | | | | | | | | | | This counts the number of times a replication event is ignored due to slave_skip_errors.
| * | MDEV-6981: feature request MASTER_GTID_WAIT status variablesKristian Nielsen2015-03-164-15/+26
| | | | | | | | | | | | | | | | | | | | | | | | Review fixes: - Coding style - Fix bad .result file - Fix test to be tolerant of different timing. - Fix test to give better info in case of unexpected timing.
| * | Merge branch 'mdev-6981-master_gtid_wait-status-variables' of ↵Kristian Nielsen2015-03-165-3/+82
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/openquery/mariadb-server into danblack Conflicts: sql/mysqld.cc
| | * | Add Master_gtid_wait_{count,time,timeouts} statusDaniel Black2015-03-125-3/+82
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | MASTER_GTID_WAIT function needs some status to evaluate its use. master_gtid_wait_count indicates how many times the function is called. master_gtid_wait_time indicates how much time in microseconds occurred waiting (or timing out) master_gtid_timeouts indicates how many time times this function timed out rather than all successful gtids events being available.
* | | MDEV-7772: SIGSEGV on my_aes_encrypt_cbc when -DWITH_SSL=bundledJan Lindström2015-03-1713-24/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two problems: - Read/Write outside of buffer at memcpy() because of incorrect parameters . OPENSSL_assert(EVP_CIPHER_CTX_iv_length(&ctx.ctx) == iv_length); // ECB does not use IV, thus incorrect assertion Added: mysql-test/include/encryption_algorithms.combinations to run tests with methods cbc, ecb and ctr in those systems where they are available (see suite.pm).
* | | MDEV-6069: Remove old logic for 3.23-to-higher upgrades from upgrade SQL scriptsNirbhay Choubey2015-03-161-412/+15
| | | | | | | | | | | | Removed pre-5.1 tweaks & logics from mysql_system_table_fix.sql.
* | | 32 bit test fixOleksandr Byelkin2015-03-162-302/+323
| | |
* | | MDEV-7728 - Improve xid cache scalability by using lock-free hashSergey Vojtovich2015-03-161-5/+6
| | | | | | | | | | | | | | | This is an addition to original patch. Some platforms are strict about atomic op argument signedness.
* | | MDEV-6572 "USE dbname" with a bad sequence erroneously connects to a wrong ↵Alexander Barkov2015-03-1613-21/+232
| | | | | | | | | | | | database
* | | MDEV-7728 - Improve xid cache scalability by using lock-free hashSergey Vojtovich2015-03-162-2/+19
| | | | | | | | | | | | Spider support for new xid cache implementation.
* | | MDEV-7728 - Improve xid cache scalability by using lock-free hashSergey Vojtovich2015-03-1613-125/+247
|/ / | | | | | | | | | | | | | | XID cache is now based on lock-free hash. Also fixed lf_hash_destroy() to call alloc destructor. Note that previous implementation had race condition when thread was accessing XA owned by different thread. This new implementation doesn't fix it either.
* | MDEV-6650 - LINT_INIT emits code in non-debug buildsSergey Vojtovich2015-03-1659-214/+87
| | | | | | | | | | Replaced all references to LINT_INIT with UNINIT_VAR and LINT_INIT_STRUCT. Removed LINT_INIT macro.
* | Test results fixed.Alexey Botchkov2015-03-162-2/+2
| |
* | Moving the conversion code from String::well_formed_copy()Alexander Barkov2015-03-164-72/+117
| | | | | | | | to my_convert_fix() - a new function in /strings.
* | InnoDB cleanup. Remove empty statements i.e. extra ; characters.Jan Lindström2015-03-168-8/+8
| |
* | MDEV-7512 GIS: ST_ synonyms for functions are not consistent.Alexey Botchkov2015-03-151-0/+12
| | | | | | | | Checked for missing synonims, added those found.
* | Test result fixed.Alexey Botchkov2015-03-151-772/+0
| |
* | MDEV-7529 GIS: ST_Relate returns unexpected results for POINT relations.Alexey Botchkov2015-03-154-9/+38
| | | | | | | | | | | | | | Problem was that we considered the point itself as the 'border' object. Instead of that the 'border' of a POINT is an empty set, and the point is the 'interior'. Another error fixed by the way - not all operations of the resulting function were properly allocated.
* | MDEV-7514 GIS: PointOnSurface returns NULL instead of the point.Alexey Botchkov2015-03-153-1/+12
| | | | | | | | Need to take into account cases of a polygon shaped as a very thin line.
* | MDEV-6954: SET STATEMENT rand_seedX = ...FOR ... makes the next rand() to ↵Oleksandr Byelkin2015-03-1410-80/+114
| | | | | | | | | | | | return 0 The variables now return real values. They can't be made usual variables because they do not have DEFAULT value.
* | MDEV-6997: SET STATEMENT last_insert_id FOR ... does not affect the value ↵Oleksandr Byelkin2015-03-136-5/+167
| | | | | | | | | | | | written to the binlog Problem was in reinitialization of first_successful_insert_id_in_prev_stmt_for_binlog after setting variables.
* | MDEV-6566 Different INSERT behaviour on bad bytes with and without character ↵Alexander Barkov2015-03-1342-252/+1899
| | | | | | | | set conversion
* | MDEV-7510 GIS: IsRing returns false for a primitive triangle.Alexey Botchkov2015-03-133-5/+28
| | | | | | | | | | The problem is in the IsSimple function. If the first and the last points of a curve coincide it's and exception and the line is still 'simple'.
* | MDEV-6989 BINARY and COLLATE xxx_bin comparisions are not used for ↵Alexander Barkov2015-03-138-81/+227
| | | | | | | | optimization in some cases
* | Adding "const" qualifier to Item::compare_collation()Alexander Barkov2015-03-134-13/+14
| |
* | MDEV-7770: Online DDL progress output contains incorrectly printed index namesJan Lindström2015-03-132-8/+26
| | | | | | | | Index names were not formatted correctly.
* | MDEV-6990 GROUP_MIN_MAX optimization is not applied in some cases when it couldAlexander Barkov2015-03-126-30/+163
| |
* | MDEV-7334 valgrind warning "unitialized bytes" in 10.1.Alexey Botchkov2015-03-123-2/+47
| | | | | | | | The 'srid' field's copying was missing in the copying Create_field::Create_field() constructor.
* | MDEV-6858: enforce_storage_engine optionJan Lindström2015-03-1216-2/+351
| | | | | | | | | | | | | | | | Merge from Percona Server enforced use of a specific storage engine authored by Stewart Smith. Modified to be session variable and modifiable only by SUPER. Use similar implementation as default_storage_engine.
* | Clean-up:Alexander Barkov2015-03-128-16/+23
| | | | | | | | | | | | - Renaming Item::is_bool_func() to is_bool_type(), to avoid assumption that the item is an Item_func derivant. - Deriving Item_func_spatial_rel from Item_bool_func rather than Item_int_func
* | MDEV-7006 MDEV-7007: SET STATEMENT and slow logOleksandr Byelkin2015-03-1214-40/+314
| | | | | | | | | | | | | | | | fixed embedded server tests MDEV-7009: SET STATEMENT min_examined_row_limit has no effect MDEV-6948:SET STATEMENT gtid_domain_id = ... FOR has no effect (same for gtid_seq_no and server_id) old values of SET STATENENT variables now saved in its own Query_arena and restored later
* | MDEV-6956:SET STATEMENT default_master_connection = ... has no effectOleksandr Byelkin2015-03-129-11/+124
| | | | | | | | the problem was in assigning default value during parsing.
* | MDEV-7759 NULLIF(x,y) is not equal to CASE WHEN x=y THEN NULL ELSE x ENDAlexander Barkov2015-03-125-32/+93
| |
* | MDEV-7671: Cache VIEW definitions in the TDCOleksandr Byelkin2015-03-1117-213/+141
| | | | | | | | (changes of backported patch are very small: strlen removed, error processing fixed, view open statistics added)
* | Merge branch '10.1' of github.com:MariaDB/server into 10.1Oleksandr Byelkin2015-03-113-21/+17
|\ \
| * | MY_CHECK_AND_SET_COMPILER_FLAG changesAlexey Botchkov2015-03-112-7/+2
| | | | | | | | | | | | | | | * watch for "redefined macro" warning * don't enable -D_FORTIFY_SOURCE=2 in debug builds (it requires -O)
| * | Removing duplicate code: adding Item_func_bool_predicate as aAlexander Barkov2015-03-111-14/+15
| | | | | | | | | | | | common parent class for Item_func_isnull and Item_func_isnotnull