summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-9576 syntax error on view with nullif and countSergei Golubchik2016-02-233-2/+18
| | | | don't transform Item_func_nullif if it's context_analysis_only
* MDEV-9606 Server crashes in fix_fields, main.null fails with ps-protocol #2Sergei Golubchik2016-02-231-1/+2
|
* MDEV-9550 COUNT(NULL) returns incorrect result with sequence storage engineSergei Golubchik2016-02-233-3/+18
| | | | | when calculating COUNT(basic_const), take into account that this basic_const may be NULL
* disable SHOW I_S_table for built-in I_S tablesSergei Golubchik2016-02-235-4/+38
| | | | | | | This fixes MDEV-9538 Server crashes in check_show_access on SHOW STATISTICS MDEV-9539 Server crashes in make_columns_old_format on SHOW GEOMETRY_COLUMNS MDEV-9540 SHOW SPATIAL_REF_SYS and SHOW SYSTEM_VARIABLES return empty results with numerous warnings
* MDEV-9535 Trigger doing "SET NEW.auctionStart = NOW();" on a timestamp kills ↵Sergei Golubchik2016-02-233-1/+19
| | | | | | | | | | MariaDB server when doing set_field_to_new_field (from switch_to_nullable_trigger_fields()) make sure that the field we're about to change actually belongs to the right table (otherwise we cannot dereference new_field[] array as the wrong table might have more fields than new_field[] has elements)
* MDEV-9500 Bug after upgrade to 10.1.10 (and 10.1.11)Sergei Golubchik2016-02-234-2/+26
| | | | | | | | | | | | | | | | | Case: table with a NOT NULL field, BEFORE UPDATE trigger, and UPDATE with a subquery that uses GROUP BY on that NOT NULL field, and needs a temporary table for it. Because of the BEFORE trigger, the field becomes nullable temporarily. But its Item_field (used in GROUP BY) doesn't. When working with the temptable some code looked at item->maybe_null, some - at field->null_ptr. The fix: make Item_field nullable when its field is. This triggers an assert. The group key size is calculated before the item is made nullable, so the group key doesn't have a null byte. The fix: make fields/items nullable before the group key size is calculated.
* MDEV-9560 Mariadb 10.1 Crashes when replicating from 10.0Sergei Golubchik2016-02-236-0/+64
| | | | | | | | | when replicating old temporal type fields (that don't store metadata in the binlog), take the precision from destination fields. (this fixes the replication failure, crashes were fixed in a different commit)
* correct temporal fields in max_display_length_for_field()Sergei Golubchik2016-02-231-3/+5
| | | | | it's *display length* (a.k.a. field_length) not storage length (a.k.a. pack_length)
* cleanupSergei Golubchik2016-02-234-42/+26
| | | | | | | * make a local variable for target_table->field[col] * move an often-used bit function to my_bit.h * remove a non-static and not really needed trivial comparison function with a very generic name
* MDEV-9475 I can't finish my_install_db using binary tar distributionSergei Golubchik2016-02-231-0/+1
| | | | | to avoid run-time libjemalloc.so dependency link binary tarballs with a static libjemalloc_pic.a
* update test results after MDEV-9307Sergei Golubchik2016-02-231-2/+2
|
* Fix build : change MYSQL_ADD_PLUGIN to be MACRO again, rather than FUNCTIONVladislav Vaintroub2016-02-221-5/+5
|
* MDEV-9601 Build client plugins, also for the cmake client-only buildVladislav Vaintroub2016-02-222-13/+17
| | | | (-DWITHOUT_SERVER=1)
* SphinxSE: add support for json filteringOliver Giles2016-02-224-7/+54
| | | | | | | The filter command did not accept characters . [ ] which are valid in an attribute name for a sphinx query with json filtering. + test case added
* MDEV-9307 - provide info about DATA/INDEX directory in INFORMATION_SCHEMA.TAVladislav Vaintroub2016-02-229-10/+35
| | | | BLES (in CREATE_OPTIONS column)
* MDEV-9529 - do not install sql script to BINDIRVladislav Vaintroub2016-02-221-5/+0
|
* MDEV-9833 - fix mysql_config --libs for weird cases, where mysqlclient link ↵Vladislav Vaintroub2016-02-221-1/+1
| | | | dependencies contain flags instead of libraries (like -pthread rather than -lpthread)
* MDEV-9489:Assertion `0' failed in Protocol::end_statement() on UNION ALLOleksandr Byelkin2016-02-213-0/+33
| | | | Restoring currect_select fixed.
* MDEV-9564 - added s390x to lib64 INSTALL_LIBDIR handlingSergey Vojtovich2016-02-181-1/+1
| | | | | | Adjusted INSTALL_LIBDIR detection so that it is set to "lib64" on any 64bit system (not only x86_64). New condition is insipired by GNUInstallDirs cmake module.
* mysqlreport update to 4.0, see MDEV-573 for more informationsJean Weisbuch2016-02-171-101/+429
|
* MDEV-9484 - Typo fixesDaniel Dent2016-02-172-2/+2
|
* Added regression test for MDEV_5871Andrew McDonnell2016-02-174-1/+209
|
* MDEV-9559: Server without encryption configs crashes if selecting from an ↵Jan Lindström2016-02-1716-91/+301
| | | | | | | | | | implicitly encrypted table There was two problems. Firstly, if page in ibuf is encrypted but decrypt failed we should not allow InnoDB to start because this means that system tablespace is encrypted and not usable. Secondly, if page decrypt is detected we should return false from buf_page_decrypt_after_read.
* MDEV-9557 - fix compilation errors due to missing krb5_free_unparsed_name() ↵Vladislav Vaintroub2016-02-163-2/+14
| | | | in old versions of Heimdal Kerberos
* Fixes needed to compile with musl C libraryMonty2016-02-077-9/+18
| | | | Patch originally by Codarren Velvindron
* MDEV-9504: ANALYZE TABLE shows wrong 'rows' value for ORDER BY querySergei Petrunia2016-02-033-53/+4
| | | | | | | | | | | | Revert the patch for MDEV-9504. It causes test failures, attempt to fix these causes more failures. The source of all this is that the code in test_if_skip_sort_order() has a peculiar way of treating select_limit parameter: Correct value is computed when the query plan is changed. In other cases, we use an approximation that ignores the presence of GROUP BY clause, or JOINs, or both. A patch that fixes all of the above would be too big to do in 10.1
* Fixed warnings and one memory loss found by valgrindMonty2016-02-023-13/+13
| | | | | The memory loss could happen in Aria with encrypted tables when Aria failed to encrypt a block. In normal usage this should never happen.
* Merge branch '10.0' into 10.1Monty2016-02-029-23/+81
|\ | | | | | | | | Conflicts: configure.cmake
| * Merge branch '10.0' of github.com:MariaDB/server into 10.0Sergei Petrunia2016-02-014-2/+6
| |\
| | * Merge MDEV-9112 into 10.0Kristian Nielsen2016-02-014-2/+6
| | |\ | | | | | | | | | | | | | | | | Conflicts: configure.cmake
| * | | MDEV-9505: Valgrind failure in SEL_ARG::store_min,find_used_partitionsSergei Petrunia2016-02-013-11/+42
| |/ / | | | | | | | | | | | | | | | | | | | | | create_partition_index_description() had wrong logic to calculate length of the key value buffer that is used by the range optimizer. For some reason it used MAX(partitioning_columns_len, subpartitioning_columns_len) while it should use SUM of these values.
| * | MDEV-6421 SQL_ERROR_LOG doesn't log comments in Events.Alexey Botchkov2016-01-265-11/+39
| | | | | | | | | | | | | | | Change parser so it saves all the query line to the ';' in the sp_instr::m_query.
* | | Fix authentication plugin's tests in case username contains non-alphanumeric ↵Vladislav Vaintroub2016-02-014-8/+8
| | | | | | | | | | | | character, e.g dash
* | | MDEV-9504: ANALYZE TABLE shows wrong 'rows' value for ORDER BY querySergei Petrunia2016-02-013-4/+53
| | | | | | | | | | | | | | | | | | | | | | | | - Legacy code would set JOIN_TAB::limit only for EXPLAIN queries (this variable is only used when producing EXPLAIN output) - ANALYZE/SHOW EXPLAIN need to produce EXPLAIN output for non-EXPLAIN queries, too, so we should always set JOIN_TAB::limit.
* | | Merge MDEV-9112 into 10.1Kristian Nielsen2016-02-014-2/+6
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: config.h.cmake configure.cmake
| * | MDEV-9112: Non-blocking client API missing on non-x86 platformsGeorg Richter2016-02-014-2/+6
| | | | | | | | | | | | | | | | | | | | | The check for UCONTEXT in cmake was somehow become broken, disabling the fallback to ucontext. This caused the non-blocking client API to not be available for non-x86 platforms, on which no hand-crafted assembler implementation of my_context is available.
* | | MDEV-9503 Server crashes in fix_fields, main.null fails with ps-protocolAlexander Barkov2016-02-011-24/+72
| | | | | | | | | | | | | | | | | | DBUG_ASSERT() added in the patch for MDEV-9181 did not take into account special circumstances for the prepared statement EXECUTE. Fixig the assert. Also, extending and fixing comments made during MDEV-9181.
* | | Raise the version numberElena Stepanova2016-02-011-1/+1
| | |
* | | MDEV-9502 maria.encrypt-wrong-key fails with embedded serverElena Stepanova2016-02-011-0/+2
| | | | | | | | | | | | The test restarts the server, it should not be executed for embedded
* | | MDEV9494 Fix build for Heimdal KerberosVladislav Vaintroub2016-01-311-1/+1
| | |
* | | MDEV-8724 Assertion `rc == 0' failed in ma_decrypt on reading an Aria tablemariadb-10.1.11Monty2016-01-283-28/+106
| | | | | | | | | | | | | | | Don't assert if decrypt or encrypt fails if my_assert_on_error is not set. Added failed file name if encryption/decryption fails.
* | | MDEV-9181 (NULLIF(count(table.col)), 0) gives wrong result on 10.1.xAlexander Barkov2016-01-285-15/+281
| | | | | | | | | | | | Wrapping args[0] and args[2] into an Item_cache for aggregate functions.
* | | bump the versionSergei Golubchik2016-01-281-1/+1
| | |
* | | MDEV-5273 Prepared statement doesn't return metadata after prepare.Alexey Botchkov2016-01-281-21/+29
| | | | | | | | | | | | | | | The SQL command 'PREPARE' was broken - should be take into account.
* | | MDEV-5273 Prepared statement doesn't return metadata after prepare.Alexey Botchkov2016-01-281-0/+9
| | | | | | | | | | | | Keep the embedded-server version valid.
* | | MDEV-5273 Prepared statement doesn't return metadata after prepare.Alexey Botchkov2016-01-284-0/+117
| | | | | | | | | | | | SHOW CREATE PROCEDURE/FUNCTION fixed.
* | | MDEV-5273 Prepared statement doesn't return metadata after prepare.Alexey Botchkov2016-01-283-8/+47
| | | | | | | | | | | | SHOW BINARY LOGS fixed.
* | | MDEV-5273 Prepared statement doesn't return metadata after prepare.Alexey Botchkov2016-01-284-14/+58
| | | | | | | | | | | | SHOW MASTER STATUS fixed.
* | | MDEV-5273 Prepared statement doesn't return metadata after prepare.Alexey Botchkov2016-01-284-213/+252
| | | | | | | | | | | | SHOW SLAVE STATUS fixed.
* | | MDEV-5273 Prepared statement doesn't return metadata after prepare.Alexey Botchkov2016-01-284-4/+52
| | | | | | | | | | | | Fix for SHOW GRANTS statement.