Upstream has added RETURN_IF_INNODB_NOT_STARTED where we already had one:
@@ -3496,6 +3498,7 @@ mutex_t* block_mutex;
DBUG_ENTER("i_s_innodb_fill_buffer_lru"); + RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
« Back to merge proposal
Upstream has added RETURN_ IF_INNODB_ NOT_STARTED where we already had one:
@@ -3496,6 +3498,7 @@
mutex_t* block_mutex;
DBUG_ ENTER(" i_s_innodb_ fill_buffer_ lru"); IF_INNODB_ NOT_STARTED( tables- >schema_ table_name) ;
+ RETURN_
RETURN_ IF_INNODB_ NOT_STARTED( tables- >schema_ table_name) ;