delta/mariadb-git.git - github.com: MariaDB/server.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge 10.3 into 10.4	Marko Mäkelä	2020-03-20	1	-2/+2
\|\
\| *	Merge 10.2 into 10.3	Marko Mäkelä	2020-03-20	1	-2/+2
\| \|\ \| \| \| \| \| \| \| \| \|	Also, clean up the test innodb_gis.geometry a little further.
\| \| *	MDEV-14057 InnoDB GIS tests fail.	Alexey Botchkov	2020-03-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tests fixed. MBR::Within() function fixed.
* \| \|	MDEV-15253: Default optimizer setting changes for MariaDB 10.4	Varun Gupta	2018-12-09	1	-0/+1
\|/ / \| \| \| \| \| \| \| \|	use_stat_tables= PREFERABLY optimizer_use_condition_selectivity= 4
* \|	Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext	Monty	2018-01-05	1	-112/+106
\|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
*	MDEV-14057 InnoDB GIS tests fail	Marko Mäkelä	2018-01-04	1	-0/+1636
	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.