Commit 05861963 authored by unknown's avatar unknown
Browse files

BUG#23171: Illegal group log position 

Post-merge fixes.


mysql-test/r/rpl_ndb_basic.result:
  Result change.
sql/log_event.cc:
  Adding const-cast.
parent 833ea3fd

mysql-test/r/rpl_ndb_basic.result

+2 −2
Original line number Diff line number Diff line
@@ -97,8 +97,8 @@ Replicate_Do_Table 
Replicate_Ignore_Table	<Replicate_Ignore_Table>

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	146

Last_Error	Error in Write_rows event: error during transaction execution on table test.t1

Last_Errno	1105

Last_Error	Unknown error

Skip_Counter	0

Exec_Master_Log_Pos	<Exec_Master_Log_Pos>

Relay_Log_Space	<Relay_Log_Space>

sql/log_event.cc

+1 −1
Original line number Diff line number Diff line
@@ -6024,7 +6024,7 @@ int Rows_log_event::do_apply_event(RELAY_LOG_INFO const *rli) 
          mysql_unlock_tables(thd, thd->lock);

          thd->lock= 0;

          thd->query_error= 1;

          rli->clear_tables_to_lock();

          const_cast<RELAY_LOG_INFO*>(rli)->clear_tables_to_lock();

          DBUG_RETURN(ERR_BAD_TABLE_DEF);

        }

      }