Commit 0c7b78bb authored by unknown's avatar unknown
Browse files

Fix for a compile problem in Windows. 


sql/CMakeLists.txt:
  Compile problem for Windoows
storage/innobase/handler/ha_innodb.cc:
  Removed some dead code (Marko approved)
parent 7795b59a

sql/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ ADD_DEFINITIONS(-DHAVE_ROW_BASED_REPLICATION -DMYSQL_SERVER 
ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc

               discover.cc ../libmysql/errmsg.c field.cc field_conv.cc 

               filesort.cc gstream.cc

               ha_innodb.cc ha_partition.cc

               ha_partition.cc

               handler.cc hash_filo.cc hash_filo.h 

               hostname.cc init.cc item.cc item_buff.cc item_cmpfunc.cc 

               item_create.cc item_func.cc item_geofunc.cc item_row.cc

storage/innobase/handler/ha_innodb.cc

+0 −28
Original line number Diff line number Diff line
@@ -1599,21 +1599,6 @@ innobase_init(void) 
	pthread_cond_init(&commit_cond, NULL);

	innodb_inited= 1;



	/* If this is a replication slave and we needed to do a crash recovery,

	set the master binlog position to what InnoDB internally knew about

	how far we got transactions durable inside InnoDB. There is a

	problem here: if the user used also MyISAM tables, InnoDB might not

	know the right position for them.



	THIS DOES NOT WORK CURRENTLY because replication seems to initialize

	glob_mi also after innobase_init. */



/*	if (trx_sys_mysql_master_log_pos != -1) {

		ut_memcpy(glob_mi.log_file_name, trx_sys_mysql_master_log_name,

				1 + ut_strlen(trx_sys_mysql_master_log_name));

		glob_mi.pos = trx_sys_mysql_master_log_pos;

	}

*/

	DBUG_RETURN(FALSE);

error:

	have_innodb= SHOW_OPTION_DISABLED;	// If we couldn't use handler
@@ -1688,19 +1673,6 @@ innobase_commit_low( 
		return;

	}



#ifdef DISABLED_HAVE_REPLICATION

	THD *thd=current_thd;



	if (thd && thd->slave_thread) {

		/* Update the replication position info inside InnoDB */



		trx->mysql_master_log_file_name

					= active_mi->rli.group_master_log_name;

		trx->mysql_master_log_pos = ((ib_longlong)

				active_mi->rli.future_group_master_log_pos);

	}

#endif /* HAVE_REPLICATION */



	trx_commit_for_mysql(trx);

}