mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-21 15:55:53 +02:00
Code Issues Projects Releases Packages Wiki Activity
173,494 commits 3,533 branches 376 tags 1.8 GiB
Commit graph

173,494 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergei Golubchik
a38b705fe0 MDEV-9560 Mariadb 10.1 Crashes when replicating from 10.0 
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)
 2016-02-23 10:46:16 +01:00
Sergei Golubchik
4cabc608b6 correct temporal fields in max_display_length_for_field() 
it's *display length* (a.k.a. field_length)
not storage length (a.k.a. pack_length)
 2016-02-23 10:46:16 +01:00
Sergei Golubchik
d4b1425b60 cleanup 
* 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
 2016-02-23 10:46:16 +01:00
Sergei Golubchik
ab2a9600a7 MDEV-9475 I can't finish my_install_db using binary tar distribution 
to avoid run-time libjemalloc.so dependency
link binary tarballs with a static libjemalloc_pic.a
 2016-02-23 10:46:15 +01:00
Sergei Golubchik
bb54df6ec9 update test results after MDEV-9307 2016-02-23 10:46:15 +01:00
Vladislav Vaintroub
b128f26cd5 Fix build : change MYSQL_ADD_PLUGIN to be MACRO again, rather than FUNCTION 2016-02-22 18:11:59 +01:00
Vladislav Vaintroub
c20979b163 MDEV-9601 Build client plugins, also for the cmake client-only build 
(-DWITHOUT_SERVER=1)
 2016-02-22 16:26:44 +01:00
Oliver Giles
d9c640aa8b SphinxSE: add support for json filtering 
The filter command did not accept characters . [ ] which are valid
in an attribute name for a sphinx query with json filtering.

+ test case added
 2016-02-22 12:50:39 +01:00
Vladislav Vaintroub
3a24f1cf84 MDEV-9307 - provide info about DATA/INDEX directory in INFORMATION_SCHEMA.TA 
BLES (in CREATE_OPTIONS column)
 2016-02-22 12:48:03 +01:00
Vladislav Vaintroub
ff25158d7f MDEV-9529 - do not install sql script to BINDIR 2016-02-22 12:42:56 +01:00
Vladislav Vaintroub
bcd2a156ee MDEV-9833 - fix mysql_config --libs for weird cases, where mysqlclient link dependencies contain flags instead of libraries (like -pthread rather than -lpthread) 2016-02-22 12:42:28 +01:00
Oleksandr Byelkin
4b08b10b3a MDEV-9489:Assertion `0' failed in Protocol::end_statement() on UNION ALL 
Restoring currect_select fixed.
 2016-02-21 22:16:17 +01:00
Sergey Vojtovich
fd8e846a3b MDEV-9564 - added s390x to lib64 INSTALL_LIBDIR handling 
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.
 2016-02-18 11:01:22 +04:00
Jean Weisbuch
db5b51fb7e mysqlreport update to 4.0, see MDEV-573 for more informations 2016-02-17 21:46:32 +04:00
Daniel Dent
f22f2a62ae MDEV-9484 - Typo fixes 2016-02-17 21:46:32 +04:00
Andrew McDonnell
59b6b99ce3 Added regression test for MDEV_5871 2016-02-17 21:46:32 +04:00
Jan Lindström
36ca65b73b MDEV-9559: Server without encryption configs crashes if selecting from an 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.
 2016-02-17 12:32:07 +02:00
Vladislav Vaintroub
1ac64b7510 MDEV-9557 - fix compilation errors due to missing krb5_free_unparsed_name() in old versions of Heimdal Kerberos 2016-02-16 12:55:45 +00:00
Monty
d80b8442a6 Fixes needed to compile with musl C library 
Patch originally by Codarren Velvindron
 2016-02-07 15:00:30 +02:00
Sergei Petrunia
07b8aefe90 MDEV-9504: ANALYZE TABLE shows wrong 'rows' value for ORDER BY query 
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
 2016-02-03 00:17:55 +03:00
Monty
55ea26541d Fixed warnings and one memory loss found by valgrind 
The memory loss could happen in Aria with encrypted tables when Aria failed to encrypt a block.
In normal usage this should never happen.
 2016-02-02 19:54:18 +02:00
Monty
11c2d3c3e2 Merge branch '10.0' into 10.1 
Conflicts:
	configure.cmake
 2016-02-02 13:07:53 +02:00
Vladislav Vaintroub
52d695fef4 Fix authentication plugin's tests in case username contains non-alphanumeric character, e.g dash 2016-02-01 17:51:57 +01:00
Sergei Petrunia
5cf293fcad Merge branch '10.0' of github.com:MariaDB/server into 10.0 2016-02-01 19:37:06 +03:00
Sergei Petrunia
74f15e2a7f MDEV-9505: Valgrind failure in SEL_ARG::store_min,find_used_partitions 
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.
 2016-02-01 19:36:22 +03:00
Sergei Petrunia
e6dee57f1a MDEV-9504: ANALYZE TABLE shows wrong 'rows' value for ORDER BY query 
- 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.
 2016-02-01 19:07:46 +03:00
Kristian Nielsen
91ff017297 Merge MDEV-9112 into 10.1 
Conflicts:
	config.h.cmake
	configure.cmake
 2016-02-01 16:40:20 +01:00
Kristian Nielsen
955126e31d Merge MDEV-9112 into 10.0 
Conflicts:
	configure.cmake
 2016-02-01 16:29:00 +01:00
Georg Richter
8cf1f50967 MDEV-9112: Non-blocking client API missing on non-x86 platforms 
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.
 2016-02-01 16:12:00 +01:00
Alexander Barkov
a96fbc3c35 MDEV-9503 Server crashes in fix_fields, main.null fails with ps-protocol 
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.
 2016-02-01 12:43:19 +04:00
Elena Stepanova
dc50a3dd19 Raise the version number 2016-02-01 01:02:23 +02:00
Elena Stepanova
0bee1504a3 MDEV-9502 maria.encrypt-wrong-key fails with embedded server 
The test restarts the server, it should not be executed for embedded
 2016-02-01 01:01:29 +02:00
Vladislav Vaintroub
3d794d0ee8 MDEV9494 Fix build for Heimdal Kerberos 2016-01-31 00:36:33 +01:00
Monty
7b14ba63f2 MDEV-8724 Assertion `rc == 0' failed in ma_decrypt on reading an Aria table 
Don't assert if decrypt or encrypt fails if my_assert_on_error is not set.
Added failed file name if encryption/decryption fails.
 2016-01-28 14:06:05 +02:00
Alexander Barkov
ce40ccaf24 MDEV-9181 (NULLIF(count(table.col)), 0) gives wrong result on 10.1.x 
Wrapping args[0] and args[2] into an Item_cache for aggregate functions.
 2016-01-28 13:58:39 +04:00
Sergei Golubchik
5092ab28ba bump the version 2016-01-28 08:57:30 +01:00
Alexey Botchkov
11c85e1d9f MDEV-5273 Prepared statement doesn't return metadata after prepare. 
The SQL command 'PREPARE' was broken - should be take into
        account.
 2016-01-28 11:12:04 +04:00
Alexey Botchkov
418518c0b1 MDEV-5273 Prepared statement doesn't return metadata after prepare. 
Keep the embedded-server version valid.
 2016-01-28 11:12:04 +04:00
Alexey Botchkov
d16d40be2c MDEV-5273 Prepared statement doesn't return metadata after prepare. 
SHOW CREATE PROCEDURE/FUNCTION fixed.
 2016-01-28 11:12:03 +04:00
Alexey Botchkov
34df3140f2 MDEV-5273 Prepared statement doesn't return metadata after prepare. 
SHOW BINARY LOGS fixed.
 2016-01-28 11:12:03 +04:00
Alexey Botchkov
efb36ac5d5 MDEV-5273 Prepared statement doesn't return metadata after prepare. 
SHOW MASTER STATUS fixed.
 2016-01-28 11:12:03 +04:00
Alexey Botchkov
75a1d866dd MDEV-5273 Prepared statement doesn't return metadata after prepare. 
SHOW SLAVE STATUS fixed.
 2016-01-28 11:12:03 +04:00
Alexey Botchkov
552d33095a MDEV-5273 Prepared statement doesn't return metadata after prepare. 
Fix for SHOW GRANTS statement.
 2016-01-28 11:12:03 +04:00
Alexey Botchkov
f3926cd18e MDEV-5273 Prepared statement doesn't return metadata after prepare. 
Fix for SHOW CREATE DATABASE.
 2016-01-28 11:12:03 +04:00
Oleksandr Byelkin
07e9762940 MDEV-8615: Assertion `m_cpp_buf <= begin_ptr && begin_ptr <= m_cpp_buf + m_buf_length' failed in Lex_input_stream::body_utf8_start 
Nothing should be done before any keyword recognized.
 2016-01-27 21:17:23 +01:00
Sergei Golubchik
eb15566138 fix failures of ps and ps_1general in --ps-protocol 2016-01-27 16:40:15 +01:00
Sergei Golubchik
02cc921a44 compiler warnings 2016-01-27 16:40:15 +01:00
Vladislav Vaintroub
4b31e6dc95 Address review comments, add unit test 2016-01-27 16:34:05 +01:00
Georg Richter
c1bf5ba27e Revert "On Windows SSL works with sockets only, so we shouldn't tell the client" 
This reverts commit 2ee149be4e.
 2016-01-27 16:34:05 +01:00
Georg Richter
33e5a8aba2 On Windows SSL works with sockets only, so we shouldn't tell the client 
that we support SSL when using named pipes or shared memory.
 2016-01-27 16:34:05 +01:00