diff options
| author | unknown <monty@narttu.mysql.fi> | 2007-12-30 22:52:33 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2007-12-30 22:52:33 +0200 |
| commit | 1e9ee8abbd348f3bf1f4342b4db69a025a289523 (patch) | |
| tree | 5b0392a55726cb9210e71fbc3b88c4bc7dcd2b33 /include/my_global.h | |
| parent | f21390874d1325bd829edc952501eb4381ed8732 (diff) | |
| parent | bfd5c273c4fb16396279a8a7b396a6558e5a59b0 (diff) | |
| download | mariadb-git-1e9ee8abbd348f3bf1f4342b4db69a025a289523.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-maria
into mysql.com:/home/my/mysql-maria
dbug/dbug.c:
Auto merged
include/my_dbug.h:
Auto merged
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/maria-recovery.result:
Auto merged
mysql-test/t/maria-recovery.test:
Auto merged
mysql-test/t/maria.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_show.cc:
Auto merged
storage/maria/Makefile.am:
Auto merged
storage/maria/ha_maria.cc:
Auto merged
storage/maria/ma_bitmap.c:
Auto merged
storage/maria/ma_check.c:
Auto merged
storage/maria/ma_key_recover.c:
Auto merged
storage/maria/ma_loghandler.c:
Auto merged
storage/maria/ma_open.c:
Auto merged
storage/maria/ma_recovery.c:
Auto merged
storage/maria/maria_chk.c:
Auto merged
storage/maria/maria_def.h:
Auto merged
storage/maria/ma_test_all.sh:
Use remote version
mysql-test/r/maria.result:
Trivial merge
storage/maria/ma_pagecache.c:
Trivial merge
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/my_global.h b/include/my_global.h index 1287ae3ac2a..92326b2847c 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -642,6 +642,7 @@ C_MODE_END # endif #endif +typedef char my_bool; /* Small bool */ #include <my_dbug.h> #define MIN_ARRAY_SIZE 0 /* Zero or One. Gcc allows zero*/ @@ -1072,7 +1073,6 @@ typedef off_t os_off_t; typedef uint8 int7; /* Most effective integer 0 <= x <= 127 */ typedef short int15; /* Most effective integer 0 <= x <= 32767 */ typedef int myf; /* Type of MyFlags in my_funcs */ -typedef char my_bool; /* Small bool */ #if !defined(bool) && !defined(bool_defined) && (!defined(HAVE_BOOL) || !defined(__cplusplus)) typedef char bool; /* Ordinary boolean values 0 1 */ #endif @@ -1136,9 +1136,7 @@ typedef char bool; /* Ordinary boolean values 0 1 */ #define SCALE_SEC 100 #define SCALE_USEC 10000 #define MY_HOW_OFTEN_TO_ALARM 2 /* How often we want info on screen */ -#define MY_HOW_OFTEN_TO_WRITE 1000 /* How often we want info on screen */ - - +#define MY_HOW_OFTEN_TO_WRITE 10000 /* How often we want info on screen */ /* Define-funktions for reading and storing in machine independent format |