summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '10.1' into 10.2Monty2016-02-06166-1144/+5719
|\ | | | | | | | | | | | | | | | | | | Conflicts: VERSION cmake/plugin.cmake config.h.cmake configure.cmake plugin/server_audit/server_audit.c sql/sql_yacc.yy
| * 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.
| * | | MDEV-5273 Prepared statement doesn't return metadata after prepare.Alexey Botchkov2016-01-284-26/+63
| | | | | | | | | | | | | | | | Fix for SHOW CREATE DATABASE.
| * | | MDEV-8615: Assertion `m_cpp_buf <= begin_ptr && begin_ptr <= m_cpp_buf + ↵Oleksandr Byelkin2016-01-273-57/+133
| | | | | | | | | | | | | | | | | | | | | | | | m_buf_length' failed in Lex_input_stream::body_utf8_start Nothing should be done before any keyword recognized.
| * | | fix failures of ps and ps_1general in --ps-protocolSergei Golubchik2016-01-271-5/+9
| | | |
| * | | compiler warningsSergei Golubchik2016-01-273-3/+2
| | | |
| * | | Address review comments, add unit testVladislav Vaintroub2016-01-275-69/+55
| | | |
| * | | Revert "On Windows SSL works with sockets only, so we shouldn't tell the client"Georg Richter2016-01-271-5/+2
| | | | | | | | | | | | | | | | This reverts commit 2ee149be4e9319208dfcfb77712aa1ef805f6ba8.
| * | | On Windows SSL works with sockets only, so we shouldn't tell the clientGeorg Richter2016-01-271-2/+5
| | | | | | | | | | | | | | | | that we support SSL when using named pipes or shared memory.
| * | | New authentication plugin for authentication via named pipe on WindowsGeorg Richter2016-01-272-0/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | operating systems. The plugin gets the sid of the client process and considers the user authenticated if the given username matches the username of this sid.
| * | | Fixed MDEV-9347 Not all rows returned by the C APIMonty2016-01-272-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was that insert-order (enforced by the optimizer) did not handle the case where the bitmap changed to a new one. Fixed by remembering the last bitmap page used and to force usage of this when inserting new rows
| * | | MDEV-9332 Bug after upgrade to 10.1.10Alexander Barkov2016-01-275-8/+135
| | | |
| * | | [MDEV-9468]: Client hangs in my_addr_resolveVicențiu Ciorbaru2016-01-261-1/+5
| | | | | | | | | | | | | | | | Account for timeout of select returning a 0 error code.
| * | | Comment fixed.Alexey Botchkov2016-01-261-1/+1
| | | |
| * | | MDEV-5273 Prepared statement doesn't return metadata after prepare.Alexey Botchkov2016-01-264-29/+118
| | | | | | | | | | | | | | | | | | | | The metadata creation part of the mysqld_shww_create separated to be used on the mysqld_stmt_prepare stage.
| * | | Fix packaging for client RPM plugins - provide 'ignored' listVladislav Vaintroub2016-01-261-5/+5
| | | |
| * | | Merge branch '10.1' of http://github.com/MariaDB/server into 10.1Vladislav Vaintroub2016-01-263-8/+10
| |\ \ \
| | * | | A clean-up patch for Item_func_conv_charset (needed for MDEV-9181)Alexander Barkov2016-01-263-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Removing the "conv_charset" member and using collation.collation instead, as they duplicated each other.
| * | | | Fix invalid format warningsVladislav Vaintroub2016-01-262-2/+2
| |/ / /
| * | | after merge fixesSergei Golubchik2016-01-252-4/+4
| | | | | | | | | | | | | | | | fix compiler warnings
| * | | Merge branch 'connect/10.1' into 10.1Sergei Golubchik2016-01-259-43/+62
| |\ \ \
| | * | | - Fix MDEV-9239. Meanwhile, make all references to the database in XTAB SchemaOlivier Bertrand2016-01-098-42/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (was sometimes in XTAB Catalog) modified: storage/connect/mycat.cc modified: storage/connect/mycat.h modified: storage/connect/reldef.cpp modified: storage/connect/reldef.h modified: storage/connect/tabmysql.cpp modified: storage/connect/tabpivot.cpp modified: storage/connect/tabtbl.cpp modified: storage/connect/tabutil.cpp
| | * | | - Fix MDEV-9322.Olivier Bertrand2015-12-271-1/+1
| | | | | | | | | | | | | | | | | | | | modified: storage/connect/json.cpp
| * | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-01-2532-318/+1461
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | update test resultsSergei Golubchik2016-01-251-3/+3
| | | | |
| | * | | Merge branch '5.5' into 10.0Alexey Botchkov2016-01-258-279/+1338
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | Conflicts: plugin/server_audit/server_audit.c
View Lorry Controller Status