diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-10-25 18:28:31 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-10-25 18:28:31 +0200 |
| commit | 675f27b382457de77d8a128124b132439eb5cfaf (patch) | |
| tree | 4ee3476bdb0bc6659af46f26190a8f6dda15e85e /storage/xtradb/fil/fil0fil.cc | |
| parent | 12c3e16dfa872f19186761da28590c2703c96a6b (diff) | |
| parent | d7dc03a26797f07625e8c44d2d1ac7f76e860bad (diff) | |
| download | mariadb-git-675f27b382457de77d8a128124b132439eb5cfaf.tar.gz | |
Merge branch 'merge/merge-xtradb-5.6' into 10.0
commented out the "compressed columns" feature
Diffstat (limited to 'storage/xtradb/fil/fil0fil.cc')
| -rw-r--r-- | storage/xtradb/fil/fil0fil.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/xtradb/fil/fil0fil.cc b/storage/xtradb/fil/fil0fil.cc index cf2a1333c83..a7b0377d2a4 100644 --- a/storage/xtradb/fil/fil0fil.cc +++ b/storage/xtradb/fil/fil0fil.cc @@ -325,6 +325,8 @@ fil_space_get_by_id( ut_ad(space->magic_n == FIL_SPACE_MAGIC_N), space->id == id); + /* The system tablespace must always be found */ + ut_ad(space || id != 0 || srv_is_being_started); return(space); } |