summaryrefslogtreecommitdiff
path: root/mysql-test/main/merge_debug.test
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-18650: Options deprecated in previous versions - storage_engineVicențiu Ciorbaru2020-02-131-4/+4
| | | | | | | Remove usage of deprecated variable storage_engine. It was deprecated in 5.5 but it never issued a deprecation warning. Make it issue a warning in 10.5.1. Replaced with default_storage_engine.
* Merge branch '10.2' into 10.3Sergei Petrunia2020-01-171-1/+1
| | | | | | | | | | | | | | | # Conflicts: # mysql-test/suite/galera/r/MW-388.result # mysql-test/suite/galera/t/MW-388.test # mysql-test/suite/innodb/r/truncate_inject.result # mysql-test/suite/innodb/t/truncate_inject.test # mysql-test/suite/rpl/r/rpl_stop_slave.result # mysql-test/suite/rpl/t/rpl_stop_slave.test # sql/sp_head.cc # sql/sp_head.h # sql/sql_lex.cc # sql/sql_yacc.yy # storage/xtradb/buf/buf0dblwr.cc
* Create 'main' test directory and move 't' and 'r' thereMichael Widenius2018-03-291-0/+46