Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks-merge

2025-08-08 11:22:35 +03:00 · 2017-09-19 15:34:38 +03:00
parent a2d2866e80 7d49aab32c
commit 6b0588018a
2312 changed files with 188819 additions and 61333 deletions
--- a/storage/rocksdb/rdb_datadic.cc
+++ b/storage/rocksdb/rdb_datadic.cc
@@ -65,6 +65,7 @@ inline bool field_check_field_name_match(Field *field, const char *name)
                             name));
 }

+
 /*
  Rdb_key_def class implementation
 */