Fix the DBUG_ASSERT in Proto_manager::get_descriptor

razvanm · razvanm · commit 6db4ec190417 · 2015-10-25T21:59:18.000-07:00
The read_proto_file and find_proto_definition change state so we cannot run
them only in debug mode.
diff --git a/sql/proto_manager.cc b/sql/proto_manager.cc
@@ -142,8 +142,11 @@ Descriptor *Proto_manager::get_descriptor(String *file_path, String *field,
   struct proto_file_data data;
   String proto_def;
 
-  DBUG_ASSERT(read_proto_file(&data, &file_name, mem_root));
-  DBUG_ASSERT(find_proto_definition(&data, field, &proto_def));
+  bool success;
+  success= read_proto_file(&data, &file_name, mem_root);
+  DBUG_ASSERT(success);
+  success= find_proto_definition(&data, field, &proto_def);
+  DBUG_ASSERT(success);
 
   DescriptorPool *pool= new DescriptorPool;
   const Descriptor *mdesc= create_descriptor(&proto_def, pool, &field_path);
