Commit 1b212995 authored by peter@mysql.com's avatar peter@mysql.com

Merge mysql.com:/home/pz/mysql/mysql-4.0-root

into mysql.com:/home/pz/mysql/mysql-4.0
parents 9bb6dea7 f51bc42c
...@@ -40,17 +40,12 @@ InnoDB */ ...@@ -40,17 +40,12 @@ InnoDB */
#include "ha_innodb.h" #include "ha_innodb.h"
/* We must declare this here because we undef SAFE_MUTEX below */
pthread_mutex_t innobase_mutex; pthread_mutex_t innobase_mutex;
/* Store MySQL definition of 'byte': in Linux it is char while InnoDB /* Store MySQL definition of 'byte': in Linux it is char while InnoDB
uses unsigned char */ uses unsigned char */
typedef byte mysql_byte; typedef byte mysql_byte;
#ifdef SAFE_MUTEX
#undef pthread_mutex_t
#endif
#define INSIDE_HA_INNOBASE_CC #define INSIDE_HA_INNOBASE_CC
/* Include necessary InnoDB headers */ /* Include necessary InnoDB headers */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment