Marko Mäkelä
af91266498
Merge 10.3 into 10.4
...
In main.index_merge_myisam we remove the test that was added in
commit a2d24def8c
because
it duplicates the test case that was added in
commit 5af12e4635
.
2020-04-16 12:12:26 +03:00
Marko Mäkelä
84db10f27b
Merge 10.2 into 10.3
2020-04-15 09:56:03 +03:00
Marko Mäkelä
87a61355e8
Merge 10.3 into 10.4
...
The MDEV-17062 fix in commit c4195305b2
was omitted.
2020-01-20 15:49:48 +02: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
Varun
772c5f3c78
MDEV-19634: Assertion `0' failed in row_sel_convert_mysql_key_to_innobase, [Warning] InnoDB: Using a partial-field key prefix in search
...
For a key with keyparts (k1,k2,k3) , if we are building a range over the keyparts
we should make sure that if min_value/max_value for a keypart is not added to
key buffer then the keyparts following should also not be allowed.
2019-06-14 23:08:00 +05:30
Marko Mäkelä
947b6b849d
Merge 10.2 into 10.3
2019-01-24 16:14:12 +02:00
Sergei Golubchik
6bb11efa4a
Merge branch '10.2' into 10.3
2019-01-03 13:09:41 +01:00
Michael Widenius
a7abddeffa
Create 'main' test directory and move 't' and 'r' there
2018-03-29 13:59:44 +03:00