summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Update mysqldump man pageiangilfillan2016-12-061-0/+23
| |/ /
| * | MDEV-11231 Server crashes in check_duplicate_key on CREATE TABLE ... SELECTSergei Golubchik2016-12-0436-280/+286
| | | | | | | | | | | | | | | | | | | | | be consistent and don't include the table name into the error message, no other CREATE TABLE error does it. (the crash happened, because thd->lex->query_tables was NULL)
| * | Merge branch 'merge/merge-tokudb-5.6' into 10.0Sergei Golubchik2016-12-049-3/+173
| |\ \
| | * | 5.6.34-79.1Sergei Golubchik2016-12-027-1/+171
| | | |
| * | | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-12-042-30/+2
| |\ \ \
| | * | | 5.6.34-79.1Sergei Golubchik2016-12-022-29/+1
| | | | |
| * | | | import a test case from percona-server-5.6.34-79.1Sergei Golubchik2016-12-043-0/+115
| | | | |
| * | | | MDEV-10744: Roles are not fully case sensitiveVicențiu Ciorbaru2016-12-013-1/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the collation used on the roles_mapping_hash, key comparison would work in a case-insensitive manner. This is incorrect from the roles mapping perspective. Make use of a case-sensitive collation for that hash, the same one used for the acl_roles hash.
| * | | | Remove labs() warning from maria and myisam storage enginesVicențiu Ciorbaru2016-12-012-6/+0
| | | | |
| * | | | Fixed bug mdev-11364.Igor Babaev2016-11-295-14/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function Item_func_isnull::update_used_tables() must handle the case when the predicate is over not nullable column in a special way. This is actually a bug of MariaDB 5.3/5.5, but it's probably hard to demonstrate that it can cause problems there.
| * | | | MDEV-10427: innodb.innodb-wl5522-debug-zip fails sporadically in buildbotJan Lindström2016-11-292-0/+7
| | | | | | | | | | | | | | | | | | | | Test intentionally crashes the server, thus corrupted pages possible.
| * | | | MDEV-11343 LOAD DATA INFILE fails to load data with an escape character ↵Alexander Barkov2016-11-298-47/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | followed by a multi-byte character Partially backporting MDEV-9874 from 10.2 to 10.0 READ_INFO::read_field() raised the ER_INVALID_CHARACTER_STRING error when reading an escape character followed by a multi-byte character. Raising wellformedness errors in READ_INFO::read_field() was wrong, because the main goal of READ_INFO::read_field() is to *unescape* the data which was presumably escaped using mysql_real_escape_string(), using the same character set with the one specified in "LOAD DATA INFILE ... CHARACTER SET ..." (or assumed by default). During LOAD DATA, multi-byte characters are not always scanned as a single entity! In case of escaped data, parts of a multi-byte character can be scanned on different loop iterations. So the old code erroneously tested welformedness in the middle of a multi-byte character. Moreover, the data after unescaping can go into a BLOB field, not a text field. Wellformedness tests are meaningless in this case. Ater this patch, wellformedness is only checked later, during Field::store(str,length,cs) time. The loop that scans bytes only makes sure to revert the changes made by mysql_real_escape_string(). Note, in some cases users can supply data which did not really go through mysql_real_escape_string() and was escaped by some other means, or was not escaped at all. The file reported in this MDEV contains the string "\ä", which is an example of such improperly escaped data, as - either there should be two backslashes: "\\ä" - or there should be no backslashes at all: "ä" mysql_real_escape_string() could not generate "\ä".
| * | | | MDEV-11348 LOAD DATA LOCAL INFILE crashes the server on loading a backslash ↵Alexander Barkov2016-11-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | followed by a multi-byte character The crash happened when if my_error() was called for any reasons during loading (e.g. a bad multi-byte sequence or a bad GEOMETRY value was found). The server sent both error and progress packets, so the client disconnected. The server then crashed on a assert about a wrong packet order in Debug build. The server also tried to read from a closed socket when calling READ_INFO::skip_data_till_eof(). As the crash happened only with "mysql" running in interactive mode, no tests are possible. The problem was not reproducible with "mysqltest" or "mysql" in batch mode.
| * | | | MDEV-6424: MariaDB server crashes with assertion failure in file ha_innodb.c ↵Jan Lindström2016-11-172-12/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | line 11652 This is not a fix, this is instrumentation to find out is MySQL frm dictionary and InnoDB data dictionary really out-of-sync when this assertion is fired, or is there some other reason (bug).
| * | | | Fixing a typo in the patch for MDEV-10780, which caused default.test failure.Alexander Barkov2016-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Fixing the "connect" command to use "localhost" instead of "127.0.0.1" to make it work with both "mtr" and "mtr --embedded".
| * | | | Fix incorrect reading of events from relaylog in parallel replication.Kristian Nielsen2016-11-162-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SQL thread keeps track of the position in the current relay log from which to read the next event. This position is not normally used, but a certain interaction with the IO thread can cause the SQL thread to re-open the relay log and seek to the stored position. In parallel replication, there were a couple of places where the position was not updated. This created a race where a re-open of the relay log could seek to the wrong position and start re-reading and processing events already handled once, causing various kinds of problems. Fix this by moving the position update into a single place in apply_event_and_update_pos(), which should ensure that the position is always updated in the parallel replication case. This problem was found from the testcase of MDEV-10863, but it is logically a separate problem.
| * | | | Back-port Master_info::using_parallel() to 10.0.Kristian Nielsen2016-11-155-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has no functional changes, but it helps avoid merge problems from 10.0 to 10.1. In 10.0, code that checks for parallel replication uses opt_slave_parallel_threads > 0, but this check needs to be mi->using_parallel() in 10.1. By using the same check in 10.0 (with unchanged semantics), merge problems to 10.1 are avoided.
| * | | | Merge branch 'mdev10863' into 10.0Kristian Nielsen2016-11-153-1/+159
| |\ \ \ \
| * | | | | A join patch for MDEV-10780 and MDEV-11265Alexander Barkov2016-11-103-0/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-10780 Server crashes in in create_tmp_table MDEV-11265 Access defied when CREATE VIIEW v1 AS SELECT DEFAULT(column) FROM t1 Item_default_value and Item_insert_value erroneously derive from Item_field but forgot to override some methods that apply only to true fields, so the server code mixes Item_{default|insert}_value instances with real table fields (i.e. true Item_field) in some cases. Overriding a few methods to avoid this. TODO: we should eventually derive Item_default_value (and Item_insert_value) directly from Item, as they don't really need the entire Item_field, Item_ident and Item_result_field functionality. Only the member "Field *field" related functionality is actually needed, like val_xxx(), is_null(), get_geometry_type(), charset_for_protocol(), etc.
| * | | | | Initialize zip_dict_ids table and avoid referencing array itemsJan Lindström2016-11-011-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | as currently MariaDB does not support compressed columns.
| * | | | | MDEV-11188: rpl.rpl_parallel_partition fails with valgrind warnings in ↵Jan Lindström2016-10-311-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | buildbot and outside
| * | | | | bump the VERSIONDaniel Bartholomew2016-10-281-1/+1
| | | | | |
| * | | | | MDEV-11164 - hardening-wrapper has been removed from Debian SidSergey Vojtovich2016-10-283-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hardening-wrapper package has been removed from Debian Sid. Remove dependency and relevant settings.
* | | | | | Updated the list of unstable testsElena Stepanova2016-12-101-108/+74
| | | | | |
* | | | | | MDEV-10435 crash with bad stat tables.Alexey Botchkov2016-12-098-41/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Functions from sql/statistics.cc don't seem to expect stat tables to fail or to have inadequate structure. Table open errors suppressed and some validity checks added. Invalid tables reported to the server log.
* | | | | | MDEV-11491 binlog_encryption.rpl_checksum fails sporadically in buildbotElena Stepanova2016-12-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The race condition happened if mark_xid_done was considerably delayed, and an extra Binlog_checkpoint event was written into the binary log which was later indicated in an error message. Fixed by ensuring that the event is written before the binary log is rotated to the one which is used in the output.
* | | | | | MDEV-11504 binlog_encryption.encrypted_master_switch_to_unencrypted fails ↵Elena Stepanova2016-12-082-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sporadically in buildbot The reason is a simple race condition. Initially the test was meant to synchronize with master before showing tables, but it turned out that the slave IO thread should fail by this point, and synchronization was removed along with a server bugfix. Now added an intermediate sync instead, to make sure that slave has replicated events before the point of failure
* | | | | | Merge pull request #272 from iangilfillan/10.1Sergey Vojtovich2016-12-071-2/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update mysqld_multi man page
| * | | | | | Update mysqld_multi man pageiangilfillan2016-12-071-2/+17
|/ / / / / /
* | | | | | Merge pull request #270 from JRonak/MDEV-11354Sergey Vojtovich2016-12-071-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | fixes MDEV-11354 twin include
| * | | | | | fixes MDEV-11354 twin includeRonak Jain2016-12-061-1/+0
| | | | | | |
* | | | | | | fix binlog_encryption.binlog_incident testSergei Golubchik2016-12-066-15/+4
| | | | | | |
* | | | | | | MDEV-10382 Using systemd, mariadb doesn't restart on crashesSergei Golubchik2016-12-061-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when crashing on a signal, don't exit(), but re-signal it, so that the caller could check WIFSIGNALED()
* | | | | | | MDEV-11052 mariadb-service-convert does not work after upgrading to 10.1.18Sergei Golubchik2016-12-061-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | mysqld_safe: don't close stdout and stderr if --dry-run
* | | | | | | MDEV-11319 mysqlbinlog crashes or fails with out of memory while reading ↵Sergei Golubchik2016-12-065-5/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some encrypted binlogs support encrypted binlogs. Not decryption, but at least recognizing that event are encrypted and prining them as such
* | | | | | | MDEV-11288 Server crashes in Binlog_crypt_data::init trying to feed ↵Sergei Golubchik2016-12-065-20/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | encrypted log without decryption capabilities
* | | | | | | MDEV-9038 Binlog encryption testsElena Stepanova2016-12-05190-8379/+18153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - created binlog_encryption test suite and added it to the default list - moved some tests from rpl, binlog and multisource suites to extra so that they could be re-used in different suites - made minor changes in include files
* | | | | | | MDEV-11233 CREATE FULLTEXT INDEX with a token longer than 127 bytesMarko Mäkelä2016-12-0513-108/+365
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crashes server This bug is the result of merging the Oracle MySQL follow-up fix BUG#22963169 MYSQL CRASHES ON CREATE FULLTEXT INDEX without merging the base bug fix: Bug#79475 Insert a token of 84 4-bytes chars into fts index causes server crash. Unlike the above mentioned fixes in MySQL, our fix will not change the storage format of fulltext indexes in InnoDB or XtraDB when a character encoding with mbmaxlen=2 or mbmaxlen=3 and the length of a word is between 128 and 84*mbmaxlen bytes. The Oracle fix would allocate 2 length bytes for these cases. Compatibility with other MySQL and MariaDB releases is ensured by persisting the used maximum length in the SYS_COLUMNS table in the InnoDB data dictionary. This fix also removes some unnecessary strcmp() calls when checking for the legacy default collation my_charset_latin1 (my_charset_latin1.name=="latin1_swedish_ci"). fts_create_one_index_table(): Store the actual length in bytes. This metadata will be written to the SYS_COLUMNS table. fts_zip_initialize(): Initialize only the first byte of the buffer. Actually the code should not even care about this first byte, because the length is set as 0. FTX_MAX_WORD_LEN: Define as HA_FT_MAXCHARLEN * 4 aka 336 bytes, not as 254 bytes. row_merge_create_fts_sort_index(): Set the actual maximum length of the column in bytes, similar to fts_create_one_index_table(). row_merge_fts_doc_tokenize(): Remove the redundant parameter word_dtype. Use the actual maximum length of the column. Calculate the extra_size in the same way as row_merge_buf_encode() does.
* | | | | | Follow-up for MDEV-9451 - fix XtraDB rdiff filesElena Stepanova2016-12-052-2/+2
| | | | | |
* | | | | | Follow-up for MDEV-11429 - fix result files for embedded and 32-bit testsElena Stepanova2016-12-053-3/+3
| | | | | |
* | | | | | MDEV-11236 Failing assertion: state == TRX_STATE_NOT_STARTEDMarko Mäkelä2016-12-028-9/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trx_state_eq(): Add the parameter bool relaxed=false, to allow trx->state==TRX_STATE_NOT_STARTED where a different state is expected, if an error has been reported. trx_release_savepoint_for_mysql(): Pass relaxed=true to trx_state_eq(). That is, allow the transaction to be idle when ROLLBACK TO SAVEPOINT is attempted after an error has been reported to the client.
* | | | | | MDEV-9451 innodb_buffer_pool_populate does not seem to work on 10.1.10Marko Mäkelä2016-12-021-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of interpreting --innodb-buffer-pool-populate as --innodb-numa-interleave, display warning when the option is set, saying that the option will be removed in MariaDB 10.2.3.
* | | | | | MDEV-10759 Fix Aria to support 2-byte collation IDsMonty2016-12-0214-26/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Used same fix as for MyISAM: High level collation byte stored in unused bit_end position. - Moved language from header to base_info - Removed unused bit_end part in HA_KEY_SEG
* | | | | | MDEV-11429 Increase number of max table_open_cache instancesMonty2016-12-026-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase max number of possible table_open_cache instances from 512K to 1024K. This only affects user who are trying to set the variable over the old limit. Delete not used test table_open_cache_instances_basic (Need to be added back and rewritten in 10.2)
* | | | | | MDEV-11168: InnoDB: Failing assertion: !other_lock || ↵sensssz2016-12-025-35/+229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wsrep_thd_is_BF(lock->trx->mysql_thd, FALSE) || wsrep_thd_is_BF(other_lock->trx->mysql_thd, FALSE) Merged pull request: Fix error in lock_has_higher_priority #266 https://github.com/MariaDB/server/pull/266 Added test case.
* | | | | | MDEV-10686: innodb_zip.innodb_prefix_index_liftedlimit failed with timeout ↵Jan Lindström2016-11-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in buildbot Test moved to big_test and not run with valgrind because of timeout.
* | | | | | MDEV-10739: encryption.innodb-page_encryption_compression fails with timeout ↵Jan Lindström2016-11-292-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on valgrind Test moved to big_test and not run on valgrind. Test heavy especially on debug builds.
* | | | | | Merge remote-tracking branch 'my/tokudb_optimistic_parallel_replication' ↵Kristian Nielsen2016-11-2830-142/+1756
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into 10.1
| * | | | | | Parallel replication test case for TokuDB.Kristian Nielsen2016-11-252-0/+972
| | | | | | |
| * | | | | | Use thd_kill_level() over old thd_killed() in TokuDB.Kristian Nielsen2016-11-234-20/+20
| | | | | | |