From f2649f104b821c370955aab1270da8bafce0bae0 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 31 Oct 2002 11:32:42 +0200 Subject: ha_innodb.cc: Fix bug: mysqld-debug-max failed standard test because a safe mutex size was seen as 24 bytes in the body of ha_innodb.cc, but 64 bytes in read0read.c sql/ha_innodb.cc: Fix bug: mysqld-debug-max failed standard test because a safe mutex size was seen as 24 bytes in the body of ha_innodb.cc, but 64 bytes in read0read.c --- sql/ha_innodb.cc | 5 ----- 1 file changed, 5 deletions(-) (limited to 'sql') diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 588c37e9cf3..79c85985f23 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -40,17 +40,12 @@ InnoDB */ #include "ha_innodb.h" -/* We must declare this here because we undef SAFE_MUTEX below */ pthread_mutex_t innobase_mutex; /* Store MySQL definition of 'byte': in Linux it is char while InnoDB uses unsigned char */ typedef byte mysql_byte; -#ifdef SAFE_MUTEX -#undef pthread_mutex_t -#endif - #define INSIDE_HA_INNOBASE_CC /* Include necessary InnoDB headers */ -- cgit v1.2.1 From e53b7488dcd18705fd785915f48cc64abd2fdb27 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 31 Oct 2002 12:03:34 +0200 Subject: srv0start.h, srv0start.c, ha_innodb.cc: Add check that sizeof(trx_t) is the same in ha_inndob.cc and InnoDB compilation modules sql/ha_innodb.cc: Add check that sizeof(trx_t) is the same in ha_inndob.cc and InnoDB compilation modules innobase/srv/srv0start.c: Add check that sizeof(trx_t) is the same in ha_inndob.cc and InnoDB compilation modules innobase/include/srv0start.h: Add check that sizeof(trx_t) is the same in ha_inndob.cc and InnoDB compilation modules --- sql/ha_innodb.cc | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'sql') diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 79c85985f23..b849bbb76b2 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -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) { -- cgit v1.2.1