maria:bb-10.10-MDEV-5215-2

Last commit made on 2022-06-15
Get this branch:
git clone -b bb-10.10-MDEV-5215-2 https://git.launchpad.net/maria

Branch merges

Branch information

Name:
bb-10.10-MDEV-5215-2
Repository:
lp:maria

Recent commits

933ef02... by Oleksandr "Sanja" Byelkin

MDEV-5215 Granted to PUBLIC

b334d04... by Oleksandr "Sanja" Byelkin

MDEV-5215 prerequisite: remove test and test_* database hacks in the test suite

29bd7b0... by Oleksandr "Sanja" Byelkin

MDEV-5215 prerequisite of prerequisite: if DB is not mentioned in connect ignore errors of switching to it

b9e61d9... by Mihyaeru <email address hidden>

MDEV-28364 Spider: remove #ifdef SPIDER_HAS_EXPR_CACHE_ITEM

a20b0d2... by Alexander Barkov

MDEV-27906 CREATE TABLE/DATABASE .. CHARSET .. COLLATE is not consistent on errors

This problem was fixed earlier by the patch for:
    MDEV-27896 Wrong result upon COLLATE .. CHARACTER SET .. on the table or the database level

Adding MTR tests only.

0af5b2a... by Nayuta Yanagisawa

MDEV-27648 fixup: delete unused member of st_spider_transaction

st_spider_transaction::thd_hash_value is no longer used because of
MDEV-27648.

8fd8a41... by Alexander Barkov

MDEV-28117 Multiple conflicting table COLLATE clauses are not rejected

This problem was earlier fixed by the patch for MDEV-27896.

Now adding only MTR tests from the report.

07cb663... by Michal Schorm

Fix the FSF address to match the current one in: http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt

f13efac... by Alexander Barkov

A cleanup for MDEV-27896 Wrong result upon `COLLATE latin1_bin CHARACTER SET latin1` on the table or the database level

Changing the error messages in a statement like this:

CREATE DATABASE db1
         COLLATE utf8mb4_bin
         CHARACTER SET utf8mb4
         CHARACTER SET latin1;

from
  COLLATION 'utf8mb4_bin' is not valid for CHARACTER SET 'latin1'

to a more expected:

  Conflicting declarations: 'CHARACTER SET utf8mb4' and 'CHARACTER SET latin1'

In order to do this:
- Adding a new type TYPE_CHARACTER_SET_COLLATE_EXACT into
  Lex_exact_charset_extended_collation_attrs_st

- Removing m_had_charset_exact from its descendant class
  Lex_extended_charset_extended_collation_attrs_st

Additional cleanup:
- Changing methods in Lex_exact_charset_extended_collation_attrs_st
  set_charset(), set_charset_collate_default(), set_charset_collate_binary()
  to get Lex_exact_charset instead CHARSET_INFO as a parameter,
  to guarantee that the argument is only CHARACTER SET and does not have
  any COLLATE clauses yet. This change is not directly related to
  the error message change.

039d83b... by Marko Mäkelä

MDEV-28554 fixup: Do not overflow the ib_logfile0 header