18795f5512
Merge 10.3 into 10.4
2022-09-13 16:36:38 +03:00
f1544424de
MDEV-29446 Change SHOW CREATE TABLE to display default collation
2022-09-12 22:10:39 +04:00
bd3c8f47cd
Merge 10.3 into 10.4
2020-03-20 22:06:55 +02:00
44298e4dea
Merge 10.2 into 10.3
...
Also, clean up the test innodb_gis.geometry a little further.
2020-03-20 18:12:17 +02:00
a0ce62f804
MDEV-14057 InnoDB GIS tests fail.
...
Tests fixed.
MBR::Within() function fixed.
2020-03-18 13:55:21 +04:00
93c360e3a5
MDEV-15253: Default optimizer setting changes for MariaDB 10.4
...
use_stat_tables= PREFERABLY
optimizer_use_condition_selectivity= 4
2018-12-09 09:22:00 +05:30
e9a2082634
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
...
Conflicts:
mysql-test/r/cte_nonrecursive.result
mysql-test/suite/galera/r/galera_bf_abort.result
mysql-test/suite/galera/r/galera_bf_abort_get_lock.result
mysql-test/suite/galera/r/galera_bf_abort_sleep.result
mysql-test/suite/galera/r/galera_enum.result
mysql-test/suite/galera/r/galera_fk_conflict.result
mysql-test/suite/galera/r/galera_insert_multi.result
mysql-test/suite/galera/r/galera_many_indexes.result
mysql-test/suite/galera/r/galera_mdl_race.result
mysql-test/suite/galera/r/galera_nopk_bit.result
mysql-test/suite/galera/r/galera_nopk_blob.result
mysql-test/suite/galera/r/galera_nopk_large_varchar.result
mysql-test/suite/galera/r/galera_nopk_unicode.result
mysql-test/suite/galera/r/galera_pk_bigint_signed.result
mysql-test/suite/galera/r/galera_pk_bigint_unsigned.result
mysql-test/suite/galera/r/galera_serializable.result
mysql-test/suite/galera/r/galera_toi_drop_database.result
mysql-test/suite/galera/r/galera_toi_lock_exclusive.result
mysql-test/suite/galera/r/galera_toi_truncate.result
mysql-test/suite/galera/r/galera_unicode_pk.result
mysql-test/suite/galera/r/galera_var_auto_inc_control_off.result
mysql-test/suite/galera/r/galera_wsrep_log_conficts.result
sql/field.cc
sql/rpl_gtid.cc
sql/share/errmsg-utf8.txt
sql/sql_acl.cc
sql/sql_parse.cc
sql/sql_partition_admin.cc
sql/sql_prepare.cc
sql/sql_repl.cc
sql/sql_table.cc
sql/sql_yacc.yy
2018-01-05 16:52:40 +02:00
8dc77a72ea
MDEV-14057 InnoDB GIS tests fail
...
Fix and enable some of the tests; some remain disabled.
The tests innodb_gis.rtree_old and innodb_gis.row_format
duplicated some versions of the test main.gis-rtree.
Instead of duplicating, source that test, in a new test
innodb_gis.innodb_gis_rtree.
Introduce innodb_row_format.combinations. Due to this,
ROW_FORMAT=COMPRESSED will not be covered in some tests
where it is covered in MySQL 5.7.
2018-01-04 19:46:23 +02:00