diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-07-08 23:48:04 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-07-08 23:48:04 +0300 |
| commit | 0e1d651e8b5e479427b89c5e164499a5eda3993d (patch) | |
| tree | cd2587ecaa9e165c577d8a9f6528b48cc488643b /include | |
| parent | fa936cb6cc6c721c20dac098083be12ba45c7e71 (diff) | |
| parent | e17562b55af10d9415e9dfefe7cba0ade1e49bca (diff) | |
| download | mariadb-git-0e1d651e8b5e479427b89c5e164499a5eda3993d.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_getopt.h | 2 | ||||
| -rw-r--r-- | include/my_sys.h | 6 | ||||
| -rw-r--r-- | include/mysqld_error.h | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/include/my_getopt.h b/include/my_getopt.h index 213c8c3570e..148238f8d1b 100644 --- a/include/my_getopt.h +++ b/include/my_getopt.h @@ -53,7 +53,7 @@ extern int handle_options (int *argc, char ***argv, char *)); extern void my_print_help(const struct my_option *options); extern void my_print_variables(const struct my_option *options); -extern void my_getopt_register_get_addr(gptr* (*func_addr)(char *, uint, +extern void my_getopt_register_get_addr(gptr* (*func_addr)(const char *, uint, const struct my_option *)); ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp); diff --git a/include/my_sys.h b/include/my_sys.h index 48ebdc22f37..7ea9f63a50f 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -501,6 +501,12 @@ my_off_t my_b_append_tell(IO_CACHE* info); #define my_b_bytes_in_cache(info) (uint) (*(info)->current_end - \ *(info)->current_pos) +/* key_cache_variables */ +typedef struct st_keycache +{ + ulonglong size; +} KEY_CACHE; + #include <my_alloc.h> /* Prototypes for mysys and my_func functions */ diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 565c2812c50..0468663239b 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -286,4 +286,5 @@ #define ER_REVOKE_GRANTS 1267 #define ER_CANT_AGGREGATE_3COLLATIONS 1268 #define ER_CANT_AGGREGATE_NCOLLATIONS 1269 -#define ER_ERROR_MESSAGES 270 +#define ER_VARIABLE_IS_NOT_STRUCT 1270 +#define ER_ERROR_MESSAGES 271 |