diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-05-24 15:29:01 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-05-24 15:29:01 +0300 |
| commit | 48af4be62a077f5edfadc9b5ea4f6c8c4b00c469 (patch) | |
| tree | 18ed52e4c23fdea08f654e611ddd30ee760c1377 /include | |
| parent | e95fdb74ab85bf24b805c1d4ead8c3d3a791b79a (diff) | |
| parent | 421c885446ddf7a996cecb0d3831f7b1a10d3701 (diff) | |
| download | mariadb-git-48af4be62a077f5edfadc9b5ea4f6c8c4b00c469.tar.gz | |
References: MDEV-4572 - merge with mariaDB 5.5.30
Diffstat (limited to 'include')
| -rw-r--r-- | include/myisamchk.h | 4 | ||||
| -rw-r--r-- | include/mysql/service_my_snprintf.h | 1 | ||||
| -rw-r--r-- | include/mysqld_default_groups.h | 8 | ||||
| -rw-r--r-- | include/thread_pool_priv.h | 1 | ||||
| -rw-r--r-- | include/welcome_copyright_notice.h | 4 |
5 files changed, 14 insertions, 4 deletions
diff --git a/include/myisamchk.h b/include/myisamchk.h index 9478936c748..0ee03c03c49 100644 --- a/include/myisamchk.h +++ b/include/myisamchk.h @@ -138,9 +138,9 @@ typedef struct st_handler_check_param /* Following is used to check if rows are visible */ ulonglong max_trid, max_found_trid; ulonglong not_visible_rows_found; + ulonglong sort_buffer_length; ulonglong use_buffers; /* Used as param to getopt() */ - size_t read_buffer_length, write_buffer_length; - size_t sort_buffer_length, sort_key_blocks; + size_t read_buffer_length, write_buffer_length, sort_key_blocks; time_t backup_time; /* To sign backup files */ ulong rec_per_key_part[HA_MAX_KEY_SEG * HA_MAX_POSSIBLE_KEY]; double new_rec_per_key_part[HA_MAX_KEY_SEG * HA_MAX_POSSIBLE_KEY]; diff --git a/include/mysql/service_my_snprintf.h b/include/mysql/service_my_snprintf.h index 57b67f1416d..a7fd3e8a2c6 100644 --- a/include/mysql/service_my_snprintf.h +++ b/include/mysql/service_my_snprintf.h @@ -49,6 +49,7 @@ string will be quoted according to MySQL identifier quoting rules. Both <width> and <precision> can be specified as numbers or '*'. + If an asterisk is used, an argument of type int is consumed. <length modifier> can be 'l', 'll', or 'z'. diff --git a/include/mysqld_default_groups.h b/include/mysqld_default_groups.h new file mode 100644 index 00000000000..a2e94ddd854 --- /dev/null +++ b/include/mysqld_default_groups.h @@ -0,0 +1,8 @@ +const char *load_default_groups[]= { +#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE +"mysql_cluster", +#endif +"mysqld", "server", MYSQL_BASE_VERSION, +"mariadb", MARIADB_BASE_VERSION, +"client-server", +0, 0}; diff --git a/include/thread_pool_priv.h b/include/thread_pool_priv.h index 78526894e21..84c7faa2e2b 100644 --- a/include/thread_pool_priv.h +++ b/include/thread_pool_priv.h @@ -61,6 +61,7 @@ uint thd_get_net_read_write(THD *thd); void thd_set_mysys_var(THD *thd, st_my_thread_var *mysys_var); ulong thd_get_net_wait_timeout(THD *thd); my_socket thd_get_fd(THD *thd); +int thd_store_globals(THD* thd); THD *first_global_thread(); THD *next_global_thread(THD *thd); diff --git a/include/welcome_copyright_notice.h b/include/welcome_copyright_notice.h index 01139677b7d..9878ab1c07d 100644 --- a/include/welcome_copyright_notice.h +++ b/include/welcome_copyright_notice.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. +/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. Copyright (c) 2011, 2012, Monty Program Ab This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ #ifndef _welcome_copyright_notice_h_ #define _welcome_copyright_notice_h_ -#define COPYRIGHT_NOTICE_CURRENT_YEAR "2012" +#define COPYRIGHT_NOTICE_CURRENT_YEAR "2013" /* This define specifies copyright notice which is displayed by every MySQL |