1. 18 Sep, 2017 11 commits
  2. 17 Sep, 2017 4 commits
    • Marko Mäkelä's avatar
      Silence a -Wimplicit-fallthrough warning · 372dba09
      Marko Mäkelä authored
      372dba09
    • Marko Mäkelä's avatar
      Null-merge 10.1 into 10.2 · 72c838b9
      Marko Mäkelä authored
      72c838b9
    • Marko Mäkelä's avatar
      MDEV-12634 after-merge test fix: Exercise row_merge_write(), row_merge_read() · d6baf3d3
      Marko Mäkelä authored
      MySQL 5.7 introduced some optimizations to avoid file I/O during
      ALGORITHM=INPLACE operations. While both innodb-index-online and
      innodb-table-online will exercise both the merge sort files and
      the online log files in 10.1, in 10.2 they would only exercise the
      online log files.
      
      Modify one test case in innodb.innodb-table-online so that
      skip_pk_sort will not hold. In this way, this test case will
      write and read the merge sort files. The other instrumented tests
      in innodb-index-online and innodb-table-online will only write
      and read online_log files.
      d6baf3d3
    • Marko Mäkelä's avatar
      Merge 10.1 into 10.2 · d9277732
      Marko Mäkelä authored
      This should also fix the MariaDB 10.2.2 bug
      MDEV-13826 CREATE FULLTEXT INDEX on encrypted table fails.
      
      MDEV-12634 FIXME: Modify innodb-index-online, innodb-table-online
      so that they will write and read merge sort files. InnoDB 5.7
      introduced some optimizations to avoid using the files for small tables.
      
      Many collation test results have been adjusted for MDEV-10191.
      d9277732
  3. 16 Sep, 2017 8 commits
  4. 15 Sep, 2017 9 commits
  5. 14 Sep, 2017 8 commits
    • Marko Mäkelä's avatar
      MDEV-13626 Merge InnoDB test cases from MySQL 5.7 (part 2) · e9d2f37a
      Marko Mäkelä authored
      Import the changes to innodb.innodb-index innodb.innodb-index-debug
      
      Note: As noted in MDEV-13613, due to the behaviour change in MDEV-11114,
      DROP COLUMN will not imply DROP/ADD PRIMARY/UNIQUE KEY, like it does
      in MySQL. The tests have been adjusted accordingly.
      e9d2f37a
    • Alexey Botchkov's avatar
      e2b9f676
    • Alexey Botchkov's avatar
      Compiler warning avoided. · c94fb7b7
      Alexey Botchkov authored
      c94fb7b7
    • Jan Lindström's avatar
      MDEV-12634: Uninitialised ROW_MERGE_RESERVE_SIZE bytes written to tem… · fa2701c6
      Jan Lindström authored
      …porary file
      
      Fixed by removing writing key version to start of every block that
      was encrypted. Instead we will use single key version from log_sys
      crypt info.
      
      After this MDEV also blocks writen to row log are encrypted and blocks
      read from row log aren decrypted if encryption is configured for the
      table.
      
      innodb_status_variables[], struct srv_stats_t
      	Added status variables for merge block and row log block
      	encryption and decryption amounts.
      
      Removed ROW_MERGE_RESERVE_SIZE define.
      
      row_merge_fts_doc_tokenize
      	Remove ROW_MERGE_RESERVE_SIZE
      
      row_log_t
      	Add index, crypt_tail, crypt_head to be used in case of
      	encryption.
      
      row_log_online_op, row_log_table_close_func
      	Before writing a block encrypt it if encryption is enabled
      
      row_log_table_apply_ops, row_log_apply_ops
      	After reading a block decrypt it if encryption is enabled
      
      row_log_allocate
      	Allocate temporary buffers crypt_head and crypt_tail
      	if needed.
      
      row_log_free
      	Free temporary buffers crypt_head and crypt_tail if they
      	exist.
      
      row_merge_encrypt_buf, row_merge_decrypt_buf
      	Removed.
      
      row_merge_buf_create, row_merge_buf_write
      	Remove ROW_MERGE_RESERVE_SIZE
      
      row_merge_build_indexes
      	Allocate temporary buffer used in decryption and encryption
      	if needed.
      
      log_tmp_blocks_crypt, log_tmp_block_encrypt, log_temp_block_decrypt
      	New functions used in block encryption and decryption
      
      log_tmp_is_encrypted
      	New function to check is encryption enabled.
      
      Added test case innodb-rowlog to force creating a row log and
      verify that operations are done using introduced status
      variables.
      fa2701c6
    • Marko Mäkelä's avatar
      Follow-up to MDEV-13563 mariabackup --lock-ddl-per-table · 3f17f511
      Marko Mäkelä authored
      Fix memory leaks, and add a missing newline to a message.
      3f17f511
    • Marko Mäkelä's avatar
      cfd51c01
    • Marko Mäkelä's avatar
      Fix warnings for page_header_get_field() comparisons · 126a581b
      Marko Mäkelä authored
      The type uint16_t is apparently promoted to int in a comparison,
      causing a sign mismatch when comparing to ulint. Convert to ulint
      before comparison.
      126a581b
    • Marko Mäkelä's avatar
      Fix a warning for a debug assertion · 88106ef3
      Marko Mäkelä authored
      The type uint16_t is apparently promoted to int in a comparison,
      causing a sign mismatch when comparing to ulint.
      Convert both operands to uint16_t.
      88106ef3