Commit 23657e8c authored by heikki@hundin.mysql.fi's avatar heikki@hundin.mysql.fi
Browse files

srv0start.h, srv0start.c, ha_innodb.cc: 

  Add check that sizeof(trx_t) is the same in ha_inndob.cc and InnoDB compilation modules
parent f51bc42c

innobase/include/srv0start.h

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ innobase_shutdown_for_mysql(void); 
/*=============================*/

				/* out: DB_SUCCESS or error code */



extern  ulint   srv_sizeof_trx_t_in_ha_innodb_cc;



extern	ibool	srv_startup_is_before_trx_rollback_phase;

extern	ibool	srv_is_being_shut_down;

innobase/srv/srv0start.c

+11 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ Created 2/16/1996 Heikki Tuuri 
#include "srv0start.h"

#include "que0que.h"



ulint           srv_sizeof_trx_t_in_ha_innodb_cc;



ibool           srv_startup_is_before_trx_rollback_phase = FALSE;

ibool           srv_is_being_started = FALSE;

ibool           srv_was_started      = FALSE;
@@ -960,6 +962,15 @@ innobase_start_or_create_for_mysql(void) 
"InnoDB: !!!!!!!!!!!!!! UNIV_MEM_DEBUG switched on !!!!!!!!!!!!!!!\n"); 

#endif



        if (srv_sizeof_trx_t_in_ha_innodb_cc != (ulint)sizeof(trx_t)) {

	        fprintf(stderr,

  "InnoDB: Error: trx_t size is %lu in ha_innodb.cc but %lu in srv0start.c\n"

  "InnoDB: Check that pthread_mutex_t is defined in the same way in these\n"

  "InnoDB: compilation modules. Cannot continue.\n",

		  srv_sizeof_trx_t_in_ha_innodb_cc, (ulint)sizeof(trx_t));

		return(DB_ERROR);

	}



	log_do_write = TRUE;

/*	yydebug = TRUE; */

sql/ha_innodb.cc

+8 −0
Original line number Diff line number Diff line
@@ -747,6 +747,14 @@ innobase_init(void) 
				default_charset_info->sort_order, 256);

	}



	/* Since we in this module access directly the fields of a trx

        struct, and due to different headers and flags it might happen that

	mutex_t has a different size in this module and in InnoDB

	modules, we check at run time that the size is the same in

	these compilation modules. */



	srv_sizeof_trx_t_in_ha_innodb_cc = sizeof(trx_t);



	err = innobase_start_or_create_for_mysql();



	if (err != DB_SUCCESS) {