Skip to content

Commit 5b44a62

Browse files
spetruniaGunnar Kudrjavets
authored andcommitted
Fix a crash when starting on pre-ColumnFamily-support db.
After rocksdb::Open(), check for error first, and only then assign column family handles.
1 parent 26fbe8a commit 5b44a62

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

storage/rocksdb/ha_rocksdb.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -756,14 +756,14 @@ static int rocksdb_init_func(void *p)
756756
status= rocksdb::DB::Open(main_opts, rocksdb_db_name, cf_descr,
757757
&cf_handles, &rdb);
758758

759-
cf_manager.init(&cf_names, &cf_handles);
760759

761760
if (!status.ok())
762761
{
763762
std::string err_text= status.ToString();
764763
sql_print_error("RocksDB: Error opening instance: %s", err_text.c_str());
765764
DBUG_RETURN(1);
766765
}
766+
cf_manager.init(&cf_names, &cf_handles);
767767

768768
if (ddl_manager.init(rdb))
769769
DBUG_RETURN(1);

0 commit comments

Comments
 (0)