1. 11 Oct, 2019 1 commit
    • Marko Mäkelä's avatar
      Add encryption.innodb-redo-badkey,strict_full_crc32 · b05be3ef
      Marko Mäkelä authored
      In commit 0f7732d1
      we introduced a innodb_checksum_algorithm=full_crc32 combination
      to a number of encryption tests, and also fixed the code accordingly.
      
      The default in MariaDB 10.5 is innodb_checksum_algorithm=full_crc32.
      In a test merge to 10.5, the test encryption.innodb-redo-badkey failed
      once due to a message that had been added in that commit.
      
      Let us introduce a full_crc32 option to that test.
      And let us use strict_crc32 and strict_full_crc32 instead of the
      non-strict variants, for the previously augmented tests, to be in
      line with the earlier tests encryption.corrupted_during_recovery and
      encryption.innodb_encrypt_temporary_tables.
      b05be3ef
  2. 10 Oct, 2019 11 commits
    • Marko Mäkelä's avatar
      Merge 10.3 into 10.4 · 09afd3da
      Marko Mäkelä authored
      09afd3da
    • Marko Mäkelä's avatar
      MDEV-19783: Relax an assertion · 4cdb72f2
      Marko Mäkelä authored
      btr_page_get_split_rec_to_left(): Assert that in the leftmost leaf page,
      if the metadata record exists, index->is_instant() must hold.
      The assertion of commit 01f45bec
      could fail during innobase_instant_try().
      4cdb72f2
    • Marko Mäkelä's avatar
      MDEV-19783: Add more assertions · 01f45bec
      Marko Mäkelä authored
      btr_page_get_split_rec_to_left(): Assert that in the leftmost leaf page,
      the metadata record exists if and only if index->is_instant().
      
      page_validate(): Correct the wording of a message.
      
      rec_init_offsets(): Assert that whenever a record is in "instant ALTER"
      format, index->is_instant() must hold.
      01f45bec
    • Marko Mäkelä's avatar
      Merge 10.2 into 10.3 · 7f84e3ad
      Marko Mäkelä authored
      7f84e3ad
    • Marko Mäkelä's avatar
      MDEV-20788: Bogus assertion failure for PAGE_FREE list · 6d7a8269
      Marko Mäkelä authored
      In MDEV-11369 (instant ADD COLUMN) in MariaDB Server 10.3,
      we introduced the hidden metadata record that must be the
      first record in the clustered index if and only if
      index->is_instant() holds.
      
      To catch MDEV-19783, in
      commit ed0793e0 and
      commit 99dc40d6
      we added some assertions to find cases where
      the metadata record is missing while it should not be, or a
      record exists when it should not. Those assertions were invalid
      when traversing the PAGE_FREE list. That list can contain anything;
      we must only be able to determine the successor and the size of
      each garbage record in it.
      
      page_validate(), page_simple_validate_old(), page_simple_validate_new():
      Do not invoke page_rec_get_next_const() for traversing the PAGE_FREE
      list, but instead use a lower-level accessor that does not attempt to
      validate the REC_INFO_MIN_REC_FLAG.
      
      page_copy_rec_list_end_no_locks(),
      page_copy_rec_list_start(), page_delete_rec_list_start():
      Add assertions.
      
      btr_page_get_split_rec_to_left(): Remove a redundant return value,
      and make the output parameter the return value.
      
      btr_page_get_split_rec_to_right(), btr_page_split_and_insert(): Clean up.
      6d7a8269
    • Marko Mäkelä's avatar
      MDEV-19335 adjustment for innodb_checksum_algorithm=full_crc32 · 0f7732d1
      Marko Mäkelä authored
      When MDEV-12026 introduced innodb_checksum_algorithm=full_crc32 in
      MariaDB 10.4, it accidentally added a dependency on buf_page_t::encrypted.
      Now that the flag has been removed, we must adjust the page-read routine.
      
      buf_page_io_complete(): When the full_crc32 page checksum matches but the
      tablespace ID in the page does not match after decrypting, we should
      declare it a decryption failure and suppress the page dump output and
      any attempts to re-read the page.
      0f7732d1
    • Aleksey Midenkov's avatar
      Fix compilation 2 (GCC 9) · 545c5452
      Aleksey Midenkov authored
      Fixed warning: -Woverloaded-virtual for GCC 9 (Clang treats it differently)
      
      Caused by c9cba597
      545c5452
    • Marko Mäkelä's avatar
      Merge 10.3 into 10.4 · c11e5cdd
      Marko Mäkelä authored
      c11e5cdd
    • Aleksey Midenkov's avatar
      Fix Mroonga compilation · 3c78d1b6
      Aleksey Midenkov authored
      Fixed warnings: -Woverloaded-virtual, -Winconsistent-missing-override
      
      Caused by c9cba597
      3c78d1b6
    • Jan Lindström's avatar
      Fix compiler error when using -Wconversion. · cb3f856e
      Jan Lindström authored
      /mariadb/10.3/wsrep/wsrep_gtid.c:45:26: error: conversion from 'long int' to 'unsigned int' may change value [-Werror=conversion]
         45 |                 offset = endptr - str;
      cb3f856e
    • Michael Widenius's avatar
  3. 09 Oct, 2019 19 commits
  4. 08 Oct, 2019 6 commits
    • Jan Lindström's avatar
      Fix test case wsrep.mdev_6832 we need to wait until wsrep_ready · 57b666b2
      Jan Lindström authored
      is ON before test can end.
      57b666b2
    • Marko Mäkelä's avatar
      MDEV-15528 preparation: Remove a constant parameter · 6bc75a42
      Marko Mäkelä authored
      fsp_free_seg_inode(): Remove the constant parameter log=true.
      Only fsp_free_page() could also be called with log=false.
      
      The dead code was introduced in
      commit 304ae942
      by me, and spotted by Thirunarayanan Balathandayuthapani.
      6bc75a42
    • Marko Mäkelä's avatar
      Merge 5.5 into 10.1 · d95f96ad
      Marko Mäkelä authored
      d95f96ad
    • Sachin Setiya's avatar
      MDEV-20574 Position of events reported by mysqlbinlog is wrong with encrypted... · 27664ef2
      Sachin Setiya authored
      MDEV-20574 Position of events reported by mysqlbinlog is wrong with encrypted binlogs, SHOW BINLOG EVENTS reports the correct one.
      
      Analysis
      
      Mysqlbinlog output for encrypted binary log
      #Q> insert into tab1 values (3,'row 003')
      #190912 17:36:35 server id 10221  end_log_pos 980 CRC32 0x53bcb3d3  Table_map: `test`.`tab1` mapped to number 19
      # at 940
      #190912 17:36:35 server id 10221  end_log_pos 1026 CRC32 0xf2ae5136     Write_rows: table id 19 flags: STMT_END_F
      
      Here we can see Table_map_log_event ends at 980 but Next event starts at 940.
      And the reason for that is we do not send START_ENCRYPTION_EVENT to the slave
      
      Solution:-
      Send Start_encryption_log_event as Ignorable_log_event to slave(mysqlbinlog),
      So that mysqlbinlog can update its log_pos.
      Since Slave can request multiple FORMAT_DESCRIPTION_EVENT while master does not
      have so We only update slave master pos when master actually have the
      FORMAT_DESCRIPTION_EVENT. Similar logic should be applied for START_ENCRYPTION_EVENT.
      
      Also added the test case when new server reads the data from old server which
      does not send START_ENCRYPTION_EVENT to slave.
      
      Master Slave Upgrade Scenario.
      When Slave is updated first, Slave will have extra logic of handling
      START_ENCRYPTION_EVENT But master willnot be sending START_ENCRYPTION_EVENT.
      So there will be no issue.
      When Master is updated first, It will send  START_ENCRYPTION_EVENT to
      slave , But slave will ignore this event in queue_event.
      27664ef2
    • sachin's avatar
      MDEV-16239 Many test in rpl suite fails · 1e0f09ca
      sachin authored
      Fix rpl_skip_error test.
        We cant reset Slave_skipped_errors(even with FLUSH STATUS), So instead
      of absolute slave_skipped_errors we look for delta of slave_skipped_errors
      Fix rpl.rpl_binlog_errors and binlog_encryption.rpl_binlog_errors
        We create the $load_file and $load_file2 but we never remove them.
      Fix rpl_000011.test
        Instead of real value use delta value , Since flush status wont flush
      LONGLONG variable.
      Fix rpl_row_find_row_debug
        Instead of searching whole log_error_ file we will use search_pattern_in_file
      which runs pattern search only on latest test run , instead of full file.
      Fix rpl_ip_mix rpl_ip_mix2
        We should call reset slave all because we also want to reset master_host
      otherwise show slave status wont be empty and making repeat N a failure.
      Fix rpl_rotate_logs
        First we have to remove master.info file (cleanup) and second we have to
      call reset slave all because if we do not call reset slave all then we wont
      read master.info file beacuse we already have master config in memory.
      And this makes start slave to pass , which shoud fail becuase its permision
      is 000
      Fix circular_serverid0 test
        The reason is that ++dbug_rows_event_count == 2 in queue_event does
      not take --repeat into account. So I have reseted the dbug_rows_event_count
      in if body.
      1e0f09ca
    • Sachin's avatar
      MDEV-20591 Wrong Number of rows in mysqlbinlog output · 01bf9f8c
      Sachin authored
      calc_field_event_length should accurately calculate the size of BLOB type
      fields, Instead of returning just the bytes taken by length it should return
      length bytes + actual length.
      01bf9f8c
  5. 07 Oct, 2019 3 commits