Sergei Golubchik
25d9d2e37f
Merge branch 'bb-10.4-release' into bb-10.5-release
2021-02-15 16:43:15 +01:00
Sergei Golubchik
00a313ecf3
Merge branch 'bb-10.3-release' into bb-10.4-release
...
Note, the fix for "MDEV-23328 Server hang due to Galera lock conflict resolution"
was null-merged. 10.4 version of the fix is coming up separately
2021-02-12 17:44:22 +01:00
Sergei Golubchik
60ea09eae6
Merge branch '10.2' into 10.3
2021-02-01 13:49:33 +01:00
Vicențiu Ciorbaru
45bc7574fb
MDEV-18650: Options deprecated in previous versions - storage_engine
...
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.
2020-02-13 13:42:01 +02:00
Alexander Barkov
dc588e3d3f
Merge remote-tracking branch 'origin/10.3' into 10.4
2019-10-01 10:45:52 +04:00
Alexander Barkov
7e44c455f4
Merge remote-tracking branch 'origin/10.2' into 10.3
2019-10-01 09:37:40 +04:00
Sergei Golubchik
244f0e6dd8
Merge branch '10.3' into 10.4
2019-09-06 11:53:10 +02:00
Monty
a071e0e029
Merge branch '10.2' into 10.3
2019-09-03 13:17:32 +03:00
Marko Mäkelä
e6bdf77e4b
Merge 10.3 into 10.4
...
In is_eits_usable(), we disable an assertion that fails due to
MDEV-19334.
2019-04-25 16:05:20 +03:00
Vicențiu Ciorbaru
65eefcdc60
Merge remote-tracking branch '10.2' into 10.3
2018-04-12 12:41:19 +03:00
Michael Widenius
a7abddeffa
Create 'main' test directory and move 't' and 'r' there
2018-03-29 13:59:44 +03:00
