diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/myisamchk.h | 4 | ||||
| -rw-r--r-- | include/mysql/plugin_auth.h | 4 | ||||
| -rw-r--r-- | include/mysql/plugin_auth.h.pp | 4 | ||||
| -rw-r--r-- | include/mysql/plugin_auth_common.h | 2 | ||||
| -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 |
8 files changed, 19 insertions, 9 deletions
diff --git a/include/myisamchk.h b/include/myisamchk.h index 7e7b685a88a..c079b7d290b 100644 --- a/include/myisamchk.h +++ b/include/myisamchk.h @@ -140,9 +140,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/plugin_auth.h b/include/mysql/plugin_auth.h index 75e7fba5266..156fb386aae 100644 --- a/include/mysql/plugin_auth.h +++ b/include/mysql/plugin_auth.h @@ -27,7 +27,7 @@ #include <mysql/plugin.h> -#define MYSQL_AUTHENTICATION_INTERFACE_VERSION 0x0100 +#define MYSQL_AUTHENTICATION_INTERFACE_VERSION 0x0200 #include <mysql/plugin_auth_common.h> @@ -78,7 +78,7 @@ typedef struct st_mysql_server_auth_info Not used by the server. Available through the @@EXTERNAL_USER variable. */ - char external_user[512]; + char external_user[MYSQL_USERNAME_LENGTH+1]; /** This only affects the "Authentication failed. Password used: %s" diff --git a/include/mysql/plugin_auth.h.pp b/include/mysql/plugin_auth.h.pp index 46811825142..0f5dd26cfb3 100644 --- a/include/mysql/plugin_auth.h.pp +++ b/include/mysql/plugin_auth.h.pp @@ -266,8 +266,8 @@ typedef struct st_mysql_server_auth_info unsigned int user_name_length; const char *auth_string; unsigned long auth_string_length; - char authenticated_as[48 +1]; - char external_user[512]; + char authenticated_as[512 +1]; + char external_user[512 +1]; int password_used; const char *host_or_ip; unsigned int host_or_ip_length; diff --git a/include/mysql/plugin_auth_common.h b/include/mysql/plugin_auth_common.h index 820d299bf88..c0b61730d0d 100644 --- a/include/mysql/plugin_auth_common.h +++ b/include/mysql/plugin_auth_common.h @@ -28,7 +28,7 @@ #define MYSQL_PLUGIN_AUTH_COMMON_INCLUDED /** the max allowed length for a user name */ -#define MYSQL_USERNAME_LENGTH 48 +#define MYSQL_USERNAME_LENGTH 512 /** return values of the plugin authenticate_user() method. 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 |