1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-30 05:23:50 +03:00
Commit Graph

178274 Commits

Author SHA1 Message Date
Sergei Petrunia
eda033255a Make "SET @@rocksdb_bulk_load=0" return an error instead of crashing the server
- This is more in line with MariaDB environment
- And help with rocksdb.bulk_load_errors test, too
2017-08-03 15:16:40 +00:00
Sergey Vojtovich
bcc10a5a44 Support for server error messages in Hindi
Fixed plugins.locales failure.
2017-08-03 17:31:05 +04:00
Sergey Vojtovich
7507000ce2 Support for server error messages in Hindi
This is an addition to original patch: activate hi_IN error messages.
2017-08-03 17:28:46 +04:00
Nirbhay Choubey
bf256392e6 Support for server error messages in Hindi. 2017-08-03 15:40:23 +04:00
Vicențiu Ciorbaru
13e4bf674e Fix tokudb compilation post merge 2017-08-03 12:22:35 +03:00
Vicențiu Ciorbaru
40e213f210 Merge branch 'merge-tokudb-5.6' into 10.0 2017-08-03 12:11:31 +03:00
Vicențiu Ciorbaru
b1a2031ff9 5.6.36-82.1 2017-08-03 11:48:44 +03:00
Jan Lindström
8b019f87dd MDEV-11939: innochecksum mistakes a file for an encrypted one (page 0 invalid)
Always read full page 0 to determine does tablespace contain
encryption metadata. Tablespaces that are page compressed or
page compressed and encrypted do not compare checksum as
it does not exists. For encrypted tables use checksum
verification written for encrypted tables and normal tables
use normal method.

buf_page_is_checksum_valid_crc32
buf_page_is_checksum_valid_innodb
buf_page_is_checksum_valid_none
	Add Innochecksum logging to file

buf_page_is_corrupted
        Remove ib_logf and page_warn_strict_checksum
        calls in innochecksum compilation. Add innochecksum
        logging to file.

fil0crypt.cc fil0crypt.h
        Modify to be able to use in innochecksum compilation and
	move fil_space_verify_crypt_checksum to end of the file.
	Add innochecksum logging to file.

univ.i
        Add innochecksum strict_verify, log_file and cur_page_num
        variables as extern.

page_zip_verify_checksum
        Add innochecksum logging to file.

innochecksum.cc
        Lot of changes most notable able to read encryption
        metadata from page 0 of the tablespace.

Added test case where we corrupt intentionally
FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION (encryption key version)
FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION+4 (post encryption checksum)
FIL_DATA+10 (data)
2017-08-03 08:29:36 +03:00
Vicențiu Ciorbaru
b278c02e18 Merge branch 'merge-xtradb-5.6' into 10.0 2017-08-02 12:15:58 +03:00
Vicențiu Ciorbaru
04ae1207ed 5.6.36-82.1 2017-08-02 12:11:06 +03:00
Sergei Petrunia
fcb8d8e598 Make rocksdb.prefix_extractor_override work on Windows 2017-08-01 19:19:54 +00:00
Sergei Petrunia
0899724257 Use proper #include's 2017-08-01 08:50:48 +00:00
Sergei Petrunia
2963a49f72 Post-merge fix: Rdb_io_watchdog doesn't support windows
Part #2.
2017-08-01 08:50:25 +00:00
Vicențiu Ciorbaru
60c9485a8e Merge connect/10.0 into 10.0
Squash all connect/10.0's commits into one and keep only
changes from storage/connect directory.
2017-08-01 11:39:10 +03:00
Elena Stepanova
31f4df4505 MDEV-12915 ST_Centroid does not return the same result than MySQL
Fix storage_engine test results
2017-08-01 09:52:59 +02:00
Vicențiu Ciorbaru
e075c5b491 Update myisam_debug test result post print_lock_error change 2017-08-01 09:52:59 +02:00
Vicențiu Ciorbaru
3772516391 Update innodb test result post print_lock_error change 2017-08-01 09:52:58 +02:00
Elena Stepanova
fd47b9639d List of unstable tests for 10.0.32 release 2017-08-01 09:52:58 +02:00
Sergei Golubchik
e6e23c0d49 MDEV-9739 Assertion `m_status == DA_ERROR || m_status == DA_OK' failed in Diagnostics_area::message() ; connect.xml* tests fail in buildbot 2017-08-01 09:52:57 +02:00
Sergei Golubchik
60343871a7 MDEV-8453 Alter table not returning engine errors
remove ~15 years old print_lock_error() function, use
handler::print_error() instead

Backport from 10.1
2017-08-01 09:52:57 +02:00
Alexey Botchkov
3d2067460e MDEV-12915 ST_Centroid does not return the same result than MySQL.
Test fixed for IA64.
2017-08-01 09:52:56 +02:00
Alexey Botchkov
7f5a8f176a MDEV-12915 ST_Centroid does not return the same result than MySQL.
Calculation of the polygon's centroid fixed.
2017-08-01 09:52:56 +02:00
Alexey Botchkov
56959e7b2c MDEV-11963 RPM Lint: script-without-shebang /usr/bin/wsrep_sst_common.
Don't set the +x on /bin/wsrep_sst_common when installing.
2017-08-01 09:46:27 +04:00
Sergei Petrunia
61ca3cf524 Post-merge fix: Rdb_io_watchdog doesn't support windows
So disable it there for now.
2017-07-31 17:34:47 +00:00
Sergei Petrunia
1388afcd84 MDEV-13413: After the merge rocksdb.drop_table fails with warnings
- Fix the bad merge in drop_table.test
- Remove the obsolete rocksdb_info_log_level=info_level option
  which caused warnings to be found in the error log.
2017-07-31 13:44:15 +00:00
Sergei Petrunia
6bf757a2a9 Disable rocksdb.issue243_transactionStatus
It uses SHOW ENGINE TRANSACTION STATUS, which is not supported in MariaDB
2017-07-30 13:37:04 +00:00
Sergei Petrunia
4eec6d4cca Update test result for rocksdb.tbl_opt_data_index_dir
See MDEV-12279, MariaDB is still not able to produce nice error messages
in this case.
2017-07-30 13:36:11 +00:00
Sergei Petrunia
da9c669210 Fixes for a few more post-merge test failures 2017-07-30 12:09:51 +00:00
Sergei Petrunia
d74e43e7bc Fix rocksdb.duplicate_table test 2017-07-30 11:12:54 +00:00
Sergei Petrunia
894c797eaf Mark all tests that are derived from rocksdb.bulk_load as "big".
(Could we just put the mark into bulk_load.inc ?)
2017-07-30 10:51:27 +00:00
Sergei Petrunia
1e6b02e688 MDEV-13404: MyRocks upstream uses I_S.table_statistics.row_lock_deadlocks
Comment out a part of testcase that uses it.
2017-07-30 10:42:39 +00:00
Sergei Petrunia
c90753e671 Follow the upstream MyRocks: provide details in the ER_LOCK_DEADLOCK message
This fixes result mismatches in rocksdb.issue111, rocksdb.hermitage,
rocksdb.rocksdb_locks
2017-07-30 09:03:42 +00:00
Vicențiu Ciorbaru
f8736063de Merge branch 'merge-pcre' into 10.0 2017-07-30 11:58:56 +03:00
Vicențiu Ciorbaru
dba454ef54 8.41 2017-07-30 11:53:36 +03:00
Vicențiu Ciorbaru
051f8bc8e3 Merge branch 'merge-perfschema-5.6' into 10.0 2017-07-30 11:36:13 +03:00
Vicențiu Ciorbaru
900e3218cf Bump innodb version post merge 2017-07-30 11:35:48 +03:00
Vicențiu Ciorbaru
e1b5e98648 5.6.37 (no-changes) 2017-07-30 11:33:55 +03:00
Sergei Petrunia
123187dfed Fix the merge of rocksdb_sys_vars test suite 2017-07-29 18:06:46 +00:00
Vicențiu Ciorbaru
226dd699df Merge remote-tracking branch 'merge/merge-innodb-5.6' into 10.0
Following merge from 5.6.36, this merge also rejects changes that
collided with the rejection of 6ca4f693c1ce472e2b1bf7392607c2d1124b4293.

We initially rejected 6ca4f693c1ce472e2b1bf7392607c2d1124b4293 because
it was introducing a new storage engine API method.
2017-07-29 20:51:29 +03:00
Sergei Petrunia
ff0ae68eae Merge branch 'bb-10.2-mariarocks' of github.com:MariaDB/server into bb-10.2-mariarocks 2017-07-29 17:05:38 +00:00
Sergei Petrunia
d083c2490a Make rocksdb.bloomfilter_skip pass. 2017-07-29 17:05:14 +00:00
Vicențiu Ciorbaru
2160a85184 Update subselect test results to pass on 10.0
One query was removed due to inconsistent behaviour with subquery cache
enabled vs disabled. MDEV-13399 has been created to track this change
and fix.
2017-07-29 20:01:20 +03:00
Vicențiu Ciorbaru
d36bd69790 5.6.37 2017-07-29 19:59:51 +03:00
Sergei Petrunia
a95ace491b Test result updates: don't hardcode error numbers in the tests. 2017-07-29 15:26:55 +00:00
Sergei Petrunia
b2617cae3f Post-merge fix: fix compilation 2017-07-29 17:24:10 +03:00
Sergei Petrunia
be6c4f5d15 More post-merge updates to get the tests pass 2017-07-29 13:24:55 +00:00
Sergei Petrunia
a89d01fb60 Trivial updates to get a few rocksdb.* testcases to pass 2017-07-29 11:06:22 +00:00
Sergei Petrunia
f2952485a1 Merge MyRocks merge tree into bb-10.2-mariarocks, unfinished.
It compiles on Linux but fails a lot of tests still
2017-07-29 10:06:09 +00:00
Olivier Bertrand
df3fd420e5 wrapname hidden when no JDBC support, modified: storage/connect/tabjson.cpp 2017-07-28 21:13:19 +02:00
Sergei Petrunia
43d5edf97c Copy of
commit 394d0712d3d46a87a8063e14e998e9c22336e3a6
Author: Anca Agape <anca@fb.com>
Date:   Thu Jul 27 15:43:07 2017 -0700

    Fix rpl.rpl_4threads_deadlock test broken by D5005670

    Summary:
    In D5005670 in fill_fields_processlist() function we introduced a point
    where we were trying to take the LOCK_thd_data before the
    synchronization point used by test
    processlist_after_LOCK_thd_count_before_LOCK_thd_data. This was
    happening in get_attached_srv_session() function called. Replaced this
    with get_attached_srv_session_safe() and moved it after lock is aquired.

    Reviewed By: tianx

    Differential Revision: D5505992

    fbshipit-source-id: bc53924
2017-07-28 17:52:07 +00:00