diff options
| author | monty@hundin.mysql.fi <> | 2002-01-29 18:32:16 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-01-29 18:32:16 +0200 |
| commit | be46289855f01c0d563671beb5135c22b7bad2aa (patch) | |
| tree | dc6d00358536a5dca27f806f929ab5e25a000c92 /include | |
| parent | e2a5c3e4cd331d9addc2342549e2c47ac7e9cb7a (diff) | |
| download | mariadb-git-be46289855f01c0d563671beb5135c22b7bad2aa.tar.gz | |
New error messages
Test of unsigned BIGINT values
Fixes for queries-per-hour
Cleanup of replication code (comments and portability fixes)
Make most of the binary log code 4G clean
Changed syntax for GRANT ... QUERIES PER HOUR
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_getopt.h | 8 | ||||
| -rw-r--r-- | include/my_global.h | 15 | ||||
| -rw-r--r-- | include/mysqld_error.h | 3 |
3 files changed, 14 insertions, 12 deletions
diff --git a/include/my_getopt.h b/include/my_getopt.h index 3132d6a1672..fef8aacd75a 100644 --- a/include/my_getopt.h +++ b/include/my_getopt.h @@ -35,10 +35,10 @@ struct my_option enum get_opt_var_type var_type; enum get_opt_arg_type arg_type; int id; /* unique id or short option */ - long long def_value; /* Default value */ - long long min_value; /* Min allowed value */ - long long max_value; /* Max allowed value */ - long long sub_size; /* Subtract this from given value */ + longlong def_value; /* Default value */ + longlong min_value; /* Min allowed value */ + longlong max_value; /* Max allowed value */ + longlong sub_size; /* Subtract this from given value */ long block_size; /* Value should be a mult. of this */ int app_type; /* To be used by an application */ my_bool changeable_var; /* If true, the option is a variable */ diff --git a/include/my_global.h b/include/my_global.h index 40e70c521eb..a5fe99d5271 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -51,15 +51,16 @@ #endif #endif /* _WIN32... */ -/* The macros below are borrowed from include/linux/compiler.h in the - Linux kernel. Use them to indicate the likelyhood of the truthfulness - of a condition. This serves two purposes - newer versions of gcc will be - able to optimize for branch predication, which could yield siginficant - performance gains in frequently executed sections of the code, and the - other reason to use them is for documentation +/* + The macros below are borrowed from include/linux/compiler.h in the + Linux kernel. Use them to indicate the likelyhood of the truthfulness + of a condition. This serves two purposes - newer versions of gcc will be + able to optimize for branch predication, which could yield siginficant + performance gains in frequently executed sections of the code, and the + other reason to use them is for documentation */ -#if __GNUC__ == 2 && __GNUC_MINOR__ < 96 +#if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96) #define __builtin_expect(x, expected_value) (x) #endif diff --git a/include/mysqld_error.h b/include/mysqld_error.h index b77a194e72c..c910078331e 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -242,4 +242,5 @@ #define ER_CANT_UPDATE_WITH_READLOCK 1223 #define ER_MIXING_NOT_ALLOWED 1224 #define ER_DUP_ARGUMENT 1225 -#define ER_ERROR_MESSAGES 226 +#define ER_USER_LIMIT_REACHED 1226 +#define ER_ERROR_MESSAGES 227 |