summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-8380: Subquery parse errormdev-8380Oleksandr Byelkin2015-09-1414-100/+780
| | | | | | backport mysql parser fixes 0034963fbf199696792491bcb79d5f0731c98804 5948561812bc691bd0c13cf518a3fe77d9daf920
* Adding EXPLAIN SELECT tests for:Alexander Barkov2015-08-174-0/+218
| | | | | | MDEV-7649 wrong result when comparing utf8 column with an invalid literal This is a preparatory patch for: MDEV-8433 Make field<'broken-string' use indexes
* Adding MY_CHARSET_HANDLER::native_to_mb().Alexander Barkov2015-08-1417-23/+102
| | | | | | | This is a pre-requisite patch for: - MDEV-8433 Make field<'broken-string' use indexes - MDEV-8625 Bad result set with ignorable characters when using a prefix key - MDEV-8626 Bad result set with contractions when using a prefix key
* MDEV-8589: Non-default ENCRYPTION_KEY_ID is ignored upon reading a tableJan Lindström2015-08-1422-140/+154
| | | | | | | | | | | | | | Analysis: Problem was that when a new tablespace is created a default encryption info is also created and stored to the tablespace. Later a new encryption information was created with correct key_id but that does not affect on IV. Fix: Push encryption mode and key_id to lower levels and create correct encryption info when a new tablespace is created. This fix does not contain test case because, currently incorrect encryption key causes page corruption and a lot of error messages to error log causing mtr to fail.
* MDEV-8591: Database page corruption on disk or a failed space, Assertion ↵Jan Lindström2015-08-144-99/+121
| | | | | | | failure in file buf0buf.cc line 2856 on querying a table using wrong default encryption key Improved error messaging to show based on original page before encryption is page maybe encrypted or just corrupted.
* Recording range_mrr_icp.result (forgotten in the patch for MDEV-8613)Alexander Barkov2015-08-141-0/+12
|
* Removing unused String_copier::copy_fix.Alexander Barkov2015-08-142-35/+2
| | | | Fixing misleading comments in String_copiers::well_formed_copy().
* MDEV-8613 Full table scan for WHERE indexed_varchar_column <=> 'bad-character'Alexander Barkov2015-08-133-1/+22
|
* MDEV-8610 "WHERE CONTAINS(indexed_geometry_column,1)" causes full table scanAlexander Barkov2015-08-136-664/+729
|
* MDEV-8599 "WHERE varchar_field LIKE temporal_const" does not use range optimizerAlexander Barkov2015-08-125-170/+243
|
* Splitting a static function get_func_mm_tree() into virtualAlexander Barkov2015-08-122-260/+264
| | | | | | | | | methods in Item_bool_func descendants, which gives some advantages: - Removing the "bool inv" parameter, as its now available through "this" for Item_func_between and Item_func_in, and is not needed for the other Item_func_xxx. - Removing casts - Making a step to data types plugings
* Removing RANGE_OPT_PARA::condAlexander Barkov2015-08-121-11/+1
| | | | | Its initialization in Item_func_xxx::get_mm_tree() is redundant: the pointer to the current function is passed to get_mm_tree() anyway.
* MDEV-8441 Bad SHOW CREATE TABLE output for a table with a virtual columnAlexander Barkov2015-08-106-30/+83
|
* MDEV-8590: Fix embedded build failureNirbhay Choubey2015-08-091-0/+5
|
* MDEV-7205 : Galera cluster & sql_log_bin = off don't workNirbhay Choubey2015-08-0811-33/+229
| | | | | | | | | | | | | | | While sql_bin_log=1(0) is meant to control binary logging for the current session so that the updates to do(not) get logged into the binary log to be replicated to the async MariaDB slave. The same should not affect galera replication. That is, the updates should always get replicated to other galera nodes regardless of sql_bin_log's value. Fixed by making sure that the updates are written to binlog cache irrespective of sql_bin_log. Added test cases.
* MDEV-8582: innodb_force_primary_key option does not force PK or unique keyJan Lindström2015-08-083-11/+1
| | | | | | | Analysis: Handler used table flag HA_REQUIRE_PRIMARY_KEY but a bug on sql_table.cc function mysql_prepare_create_table internally marked secondary key with NOT NULL colums as unique key and did not then fail on requirement that table should have primary key or unique key.
* MDEV-8582: innodb_force_primary_key option does not force PK or unique keyJan Lindström2015-08-084-0/+33
| | | | | | | | | Analysis: Handler table flag HA_REQUIRE_PRIMARY_KEY alone is not enough to force primary or unique key, if table has at least one NOT NULL column and secondary key for that column. Fix: Add additional check that table really has primary key or unique key for InnoDB terms.
* MDEV-8583: Empty lines in encryption loggingJan Lindström2015-08-082-2/+2
| | | | Removed extra line break.
* MDEV-8410: Changing file-key-management to example-key-management causes ↵Jan Lindström2015-08-088-44/+472
| | | | | | | | | | | | | | | | | | | crash and no real error MDEV-8409: Changing file-key-management-encryption-algorithm causes crash and no real info why Analysis: Both bugs has two different error cases. Firstly, at startup when server reads latest checkpoint but requested key_version, key management plugin or encryption algorithm or method is not found leading corrupted log entry. Secondly, similarly when reading system tablespace if requested key_version, key management plugin or encryption algorithm or method is not found leading buffer pool page corruption. Fix: Firsly, when reading checkpoint at startup check if the log record may be encrypted and if we find that it could be encrypted, print error message and do not start server. Secondly, if page is buffer pool seems corrupted but we find out that there is crypt_info, print additional error message before asserting.
* Make ANALYZE FORMAT=JSON show execution time for filesort element.Sergei Petrunia2015-08-077-23/+48
|
* Merge branch 'mdev8302-3' into 10.1Kristian Nielsen2015-08-041-0/+2
|\
| * Fix embedded server buildKristian Nielsen2015-08-041-0/+2
| |
* | Merge MDEV-8302 into 10.1Kristian Nielsen2015-08-045-6/+147
|\ \ | |/
| * MDEV-8302: Duplicate key with parallel replicationKristian Nielsen2015-08-045-6/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug is essentially another variant of MDEV-7458. If a transaction conflict caused a deadlock kill of T2 in record_gtid() during commit, the code would do a rollback _before_ running rgi->unmark_start_commit(). This creates a race where following transactions could start too early (before T2 has completed its transaction retry). This in turn could lead to replication failure, if there was a conflict that caused eg. duplicate key error or similar. The fix is to remove these rollbacks (in Query_log_event::do_apply_event() and Xid_log_event::do_apply_event(). They seem out-of-place; code in log_event.cc generally does not roll back on error, this is handled higher up. In addition, because of the extreme difficulty of reproducing bugs like MDEV-7458 and MDEV-8302, this patch adds some extra precations to try to detect (in debug builds) or prevent (in release builds) similar bugs. ha_rollback_trans() will now call unmark_start_commit() if needed (and assert in debug build when a caller does rollback without unmark first). We also add an extra check for thd->killed() so that we avoid doing mark_start_commit() if we already have a pending deadlock kill. And we add a missing unmark_start_commit() call in the error case, found by the above assertion.
* | MDEV-5096 - Wrong error message on attempt to kill somebody else's query IDSergey Vojtovich2015-07-244-1/+44
| | | | | | | | | | Attempting to kill query owned by different user now returns better error: "You are not owner of query N" instead of "You are not owner of thread N".
* | Merge branch 'bb-10.1-serg' into 10.1mariadb-10.1.6Sergei Golubchik2015-07-23333-2273/+11343
|\ \
| * | compilation failures on WindowsSergei Golubchik2015-07-232-2/+7
| | |
| * | fix for 32-bit testsSergei Golubchik2015-07-221-128/+128
| | |
| * | MDEV-8508 mroonga fails embedded tests in 10.1Sergei Golubchik2015-07-202-2/+2
| | | | | | | | | | | | | | | as a workaround until the bug is fixed don't run mroonga tests in --embedded mode by default
| * | compiler warningSergei Golubchik2015-07-201-5/+6
| | | | | | | | | | | | | | | WARN_DEPRECATED_NO_REPLACEMENT(NULL, ...) was causing a warning, because it expanded into NULL->variables.errmsgs[...]
| * | Merge https://github.com/Kentoku/MariaDB/tree/10.1 into 10.1Sergei Golubchik2015-07-20329-2136/+11200
| |\ \
| | * | Update Mroonga to the latest version on 2015-07-02T04:12:21+0900Kentoku SHIBA2015-07-02329-2136/+11200
| | | |
| * | | Null-merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-07-200-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | because the actual merge was already done in dced5146bdfc46e200ba35a86c3c55fb60972e33 as a patch
| | * | | MDEV-8383 : "GRANT role TO user" does not replicateNirbhay Choubey2015-07-103-0/+324
| | | | | | | | | | | | | | | | | | | | | | | | | Enable replication of GRANT/REVOKE ROLE commands across galera nodes.
| | * | | MDEV-7903 : xtrabackup SST failing with maria-10.0-galeramariadb-galera-10.0.20Nirbhay Choubey2015-06-241-1/+2
| | | | | | | | | | | | | | | | | | | | Remove master-bin.state file on joiner node during SST.
| | * | | MDEV-7631 : Invalid WSREP_SST rows appear in mysqld-bin.index fileNirbhay Choubey2015-06-241-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Try not to release 0 (STDIN_FILENO) file descriptor as it can incorrectly get reused by streams opened later.
| | * | | Add close-on-exec flag to open(), socket(), accept() & fopen().Nirbhay Choubey2015-06-246-7/+38
| | | | |
| | * | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-06-2313-25/+434
| | |\ \ \
| | | * | | Update SELinux policy to allow UDP for multicast repl in galera.mariadb-galera-5.5.44Nirbhay Choubey2015-06-232-20/+30
| | | | | |
| | | * | | Merge tag 'mariadb-5.5.44' into 5.5-galeraNirbhay Choubey2015-06-21211-4424/+6440
| | | |\ \ \
| | | * | | | MDEV-8260 : Issues related to concurrent CTASNirbhay Choubey2015-06-197-23/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Wait for aborted thd (victim) to release MDL locks * Skip aborting an already aborted thd * Defer setting OK status in case of CTAS * Minor cosmetic changes * Added a test case
| | | * | | | MDEV-6829 : SELinux/AppArmor policies for Galera serverNirbhay Choubey2015-06-186-0/+278
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add SELinux policy and AppArmor profile under policy/.
| | * | | | | Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-21406-4454/+7447
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Remove duplicate script added due to bad merge.Nirbhay Choubey2015-06-211-26/+0
| | | | | | |
| | * | | | | MDEV-8239 : Idle threads post-execution end up in closing tables stateNirbhay Choubey2015-06-197-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set thd's state to 'committed' only after it has done closing tables (called indirectly by relay_group_info::cleanup_context()).
| | * | | | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-06-024-10/+61
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | MDEV-8208 : Sporadic SEGFAULT on startupNirbhay Choubey2015-05-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During server start, as wsrep initialization happens before plugin_init(), segfault may occur if wsrep THDs try to access the uninitialized maria_hton.
| | | * | | | MDEV-8166 : Adding index on new table from select crashes Galera clusterNirbhay Choubey2015-05-163-8/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In wsrep, CTAS should be handled like a regular transaction. Added a test case.
| | * | | | | Merge branch '5.5-galera' into 10.0-galeramariadb-galera-10.0.19Nirbhay Choubey2015-05-141-1/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | mysql-wsrep#38 : wsrep_sst_xtrabackup-v2 script causes innobackupex toNirbhay Choubey2015-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ..print a false positive stack trace into the log Suppress the stacktrace that innobackupex dumps on receiving SIGPIPE.