Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.2' into 10.3 | Sergei Petrunia | 2020-01-17 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | # 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 | ||||
* | Merge branch '10.2' into 10.3 | Monty | 2019-09-03 | 1 | -0/+1 |
| | |||||
* | Create 'main' test directory and move 't' and 'r' there | Michael Widenius | 2018-03-29 | 1 | -0/+10 |