Alexander Barkov
f1544424de
MDEV-29446 Change SHOW CREATE TABLE to display default collation
2022-09-12 22:10:39 +04:00
Daniel Black
a950086036
Merge 10.2 (part) into 10.3
...
commit '6de482a6fefac0c21daf33ed465644151cdf879f'
10.3 no longer errors in truncate_notembedded.test
but per comments, a non-crash is all that we are after.
2022-03-15 16:44:52 +11:00
Sergei Petrunia
e709eb9bf7
Merge branch '10.2' into 10.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
2020-01-17 00:46:40 +03:00
Oleksandr Byelkin
65c5ef9b49
dirty merge
2019-02-07 13:59:31 +01:00
Michael Widenius
a7abddeffa
Create 'main' test directory and move 't' and 'r' there
2018-03-29 13:59:44 +03:00
