diff options
author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-08-21 16:34:31 +0300 |
---|---|---|
committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-08-21 16:34:31 +0300 |
commit | 4222b2520bdea2be41b50b888f930a63f5af8991 (patch) | |
tree | 02fcc81139a9a099f0d07c25d03e8b3f40f4c6b6 /include | |
parent | 551ad1cf6f80ad1fab35746eee304d733baa9adf (diff) | |
parent | c7973615e723b13c6457b494b72be2fac35bfd18 (diff) | |
download | mariadb-git-4222b2520bdea2be41b50b888f930a63f5af8991.tar.gz |
Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32
Diffstat (limited to 'include')
-rw-r--r-- | include/base64.h | 2 | ||||
-rw-r--r-- | include/maria.h | 2 | ||||
-rw-r--r-- | include/my_bitmap.h | 2 | ||||
-rw-r--r-- | include/my_compare.h | 2 | ||||
-rw-r--r-- | include/my_context.h | 13 | ||||
-rw-r--r-- | include/my_global.h | 4 | ||||
-rw-r--r-- | include/my_md5.h | 2 | ||||
-rw-r--r-- | include/my_net.h | 2 | ||||
-rw-r--r-- | include/my_pthread.h | 8 | ||||
-rw-r--r-- | include/my_sys.h | 9 | ||||
-rw-r--r-- | include/my_time.h | 15 | ||||
-rw-r--r-- | include/my_user.h | 2 | ||||
-rw-r--r-- | include/my_xml.h | 2 | ||||
-rw-r--r-- | include/myisam.h | 2 | ||||
-rw-r--r-- | include/mysql.h | 5 | ||||
-rw-r--r-- | include/mysql.h.pp | 3 | ||||
-rw-r--r-- | include/mysql_com.h | 6 | ||||
-rw-r--r-- | include/mysql_time.h | 2 | ||||
-rw-r--r-- | include/t_ctype.h | 2 | ||||
-rw-r--r-- | include/typelib.h | 2 |
20 files changed, 50 insertions, 37 deletions
diff --git a/include/base64.h b/include/base64.h index e19da8762cb..1069c286a7a 100644 --- a/include/base64.h +++ b/include/base64.h @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __BASE64_H_INCLUDED__ #define __BASE64_H_INCLUDED__ diff --git a/include/maria.h b/include/maria.h index cb2f92e8a35..aba5d508070 100644 --- a/include/maria.h +++ b/include/maria.h @@ -387,7 +387,7 @@ void maria_disable_non_unique_index(MARIA_HA *info, ha_rows rows); my_bool maria_test_if_sort_rep(MARIA_HA *info, ha_rows rows, ulonglong key_map, my_bool force); -int maria_init_bulk_insert(MARIA_HA *info, ulong cache_size, ha_rows rows); +int maria_init_bulk_insert(MARIA_HA *info, size_t cache_size, ha_rows rows); void maria_flush_bulk_insert(MARIA_HA *info, uint inx); void maria_end_bulk_insert(MARIA_HA *info); int maria_preload(MARIA_HA *info, ulonglong key_map, my_bool ignore_leaves); diff --git a/include/my_bitmap.h b/include/my_bitmap.h index a6cd874255a..06f43f79df8 100644 --- a/include/my_bitmap.h +++ b/include/my_bitmap.h @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef _my_bitmap_h_ #define _my_bitmap_h_ diff --git a/include/my_compare.h b/include/my_compare.h index b47eb65199e..0db22b593f4 100644 --- a/include/my_compare.h +++ b/include/my_compare.h @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef _my_compare_h #define _my_compare_h diff --git a/include/my_context.h b/include/my_context.h index 1e1b7e6a749..b5daca25bba 100644 --- a/include/my_context.h +++ b/include/my_context.h @@ -27,12 +27,14 @@ #ifdef __WIN__ #define MY_CONTEXT_USE_WIN32_FIBERS 1 -#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__x86_64__) +#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__x86_64__) && !defined(__ILP32__) #define MY_CONTEXT_USE_X86_64_GCC_ASM #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__) #define MY_CONTEXT_USE_I386_GCC_ASM -#else +#elif defined(HAVE_UCONTEXT) #define MY_CONTEXT_USE_UCONTEXT +#else +#define MY_CONTEXT_DISABLE #endif #ifdef MY_CONTEXT_USE_WIN32_FIBERS @@ -104,6 +106,13 @@ struct my_context { #endif +#ifdef MY_CONTEXT_DISABLE +struct my_context { + int dummy; +}; +#endif + + /* Initialize an asynchroneous context object. Returns 0 on success, non-zero on failure. diff --git a/include/my_global.h b/include/my_global.h index fcfc052d191..2f42349b265 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ /* This is the include file that should be included 'first' in every C file. */ @@ -1436,6 +1436,7 @@ static inline char *dlerror(void) #endif /* Provide __func__ macro definition for platforms that miss it. */ +#if !defined (__func__) #if __STDC_VERSION__ < 199901L # if __GNUC__ >= 2 # define __func__ __FUNCTION__ @@ -1453,6 +1454,7 @@ static inline char *dlerror(void) #else # define __func__ "<unknown>" #endif +#endif /* !defined(__func__) */ #ifndef HAVE_RINT /** diff --git a/include/my_md5.h b/include/my_md5.h index 7328661eb71..f8838aa72f7 100644 --- a/include/my_md5.h +++ b/include/my_md5.h @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ /* See md5.c for explanation and copyright information. */ diff --git a/include/my_net.h b/include/my_net.h index 0ad3ebf0f30..78e01d4a049 100644 --- a/include/my_net.h +++ b/include/my_net.h @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ /* This file is also used to make handling of sockets and ioctl() diff --git a/include/my_pthread.h b/include/my_pthread.h index 5a921fe0f26..869ad1ee8d5 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ /* Defines to make different thread packages compatible */ @@ -119,7 +119,6 @@ int pthread_cancel(pthread_t thread); #define HAVE_LOCALTIME_R 1 #define _REENTRANT 1 #define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1 -#define PTHREAD_STACK_MIN 65536 #undef SAFE_MUTEX /* This will cause conflicts */ #define pthread_key(T,V) DWORD V @@ -857,6 +856,11 @@ extern uint thd_lib_detected; #define mysql_mutex_record_order(A,B) do { } while(0) #endif +/* At least Windows and NetBSD do not have this definition */ +#ifndef PTHREAD_STACK_MIN +#define PTHREAD_STACK_MIN 65536 +#endif + #ifdef __cplusplus } #endif diff --git a/include/my_sys.h b/include/my_sys.h index 2281d014c85..5c849eb1bb7 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef _my_sys_h #define _my_sys_h @@ -609,13 +609,6 @@ extern int check_if_legal_filename(const char *path); extern int check_if_legal_tablename(const char *path); #ifdef _WIN32 -extern int nt_share_delete(const char *name,myf MyFlags); -#define my_delete_allow_opened(fname,flags) nt_share_delete((fname),(flags)) -#else -#define my_delete_allow_opened(fname,flags) my_delete((fname),(flags)) -#endif - -#ifdef _WIN32 /* Windows-only functions (CRT equivalents)*/ extern HANDLE my_get_osfhandle(File fd); extern void my_osmaperr(unsigned long last_error); diff --git a/include/my_time.h b/include/my_time.h index 9bd545bb850..f9893fa2d01 100644 --- a/include/my_time.h +++ b/include/my_time.h @@ -65,14 +65,17 @@ typedef long my_time_t; #endif /* Flags to str_to_datetime */ -#define TIME_FUZZY_DATE 1 + +/* + TIME_FUZZY_DATES is used for the result will only be used for comparison + purposes. Conversion is as relaxed as possible. +*/ +#define TIME_FUZZY_DATES 1 #define TIME_DATETIME_ONLY 2 #define TIME_TIME_ONLY 4 -/* Must be same as MODE_NO_ZERO_IN_DATE */ -#define TIME_NO_ZERO_IN_DATE (65536L*2*2*2*2*2*2*2) -/* Must be same as MODE_NO_ZERO_DATE */ -#define TIME_NO_ZERO_DATE (TIME_NO_ZERO_IN_DATE*2) -#define TIME_INVALID_DATES (TIME_NO_ZERO_DATE*2) +#define TIME_NO_ZERO_IN_DATE (1UL << 23) /* == MODE_NO_ZERO_IN_DATE */ +#define TIME_NO_ZERO_DATE (1UL << 24) /* == MODE_NO_ZERO_DATE */ +#define TIME_INVALID_DATES (1UL << 25) /* == MODE_INVALID_DATES */ #define MYSQL_TIME_WARN_TRUNCATED 1 #define MYSQL_TIME_WARN_OUT_OF_RANGE 2 diff --git a/include/my_user.h b/include/my_user.h index 067425a2b47..46eb11a500d 100644 --- a/include/my_user.h +++ b/include/my_user.h @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ /* This is a header for libraries containing functions used in both server and diff --git a/include/my_xml.h b/include/my_xml.h index e97232c7039..aee301167ff 100644 --- a/include/my_xml.h +++ b/include/my_xml.h @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef _my_xml_h diff --git a/include/myisam.h b/include/myisam.h index eaa6b2dbd1f..83402fe660f 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -407,7 +407,7 @@ void mi_disable_non_unique_index(MI_INFO *info, ha_rows rows); my_bool mi_test_if_sort_rep(MI_INFO *info, ha_rows rows, ulonglong key_map, my_bool force); -int mi_init_bulk_insert(MI_INFO *info, ulong cache_size, ha_rows rows); +int mi_init_bulk_insert(MI_INFO *info, size_t cache_size, ha_rows rows); void mi_flush_bulk_insert(MI_INFO *info, uint inx); void mi_end_bulk_insert(MI_INFO *info); int mi_assign_to_key_cache(MI_INFO *info, ulonglong key_map, diff --git a/include/mysql.h b/include/mysql.h index 4d1fa437407..090abf46377 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -135,6 +135,7 @@ typedef unsigned long long my_ulonglong; /* backward compatibility define - to be removed eventually */ #define ER_WARN_DATA_TRUNCATED WARN_DATA_TRUNCATED +#define WARN_PLUGIN_DELETE_BUILTIN ER_PLUGIN_DELETE_BUILTIN typedef struct st_mysql_rows { struct st_mysql_rows *next; /* list of rows */ @@ -168,8 +169,10 @@ enum mysql_option MYSQL_OPT_GUESS_CONNECTION, MYSQL_SET_CLIENT_IP, MYSQL_SECURE_AUTH, MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, MYSQL_PLUGIN_DIR, MYSQL_DEFAULT_AUTH, - MYSQL_PROGRESS_CALLBACK, + MYSQL_ENABLE_CLEARTEXT_PLUGIN, + /* MariaDB options */ + MYSQL_PROGRESS_CALLBACK=5999, MYSQL_OPT_NONBLOCK=6000 }; diff --git a/include/mysql.h.pp b/include/mysql.h.pp index 48ce79046ff..c45a8d72c7c 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -262,7 +262,8 @@ enum mysql_option MYSQL_OPT_GUESS_CONNECTION, MYSQL_SET_CLIENT_IP, MYSQL_SECURE_AUTH, MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, MYSQL_PLUGIN_DIR, MYSQL_DEFAULT_AUTH, - MYSQL_PROGRESS_CALLBACK, + MYSQL_ENABLE_CLEARTEXT_PLUGIN, + MYSQL_PROGRESS_CALLBACK=5999, MYSQL_OPT_NONBLOCK=6000 }; struct st_mysql_options_extention; diff --git a/include/mysql_com.h b/include/mysql_com.h index fdd75556033..0d57b178937 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -27,6 +27,8 @@ #define USERNAME_CHAR_LENGTH 128 #define NAME_LEN (NAME_CHAR_LEN*SYSTEM_CHARSET_MBMAXLEN) #define USERNAME_LENGTH (USERNAME_CHAR_LENGTH*SYSTEM_CHARSET_MBMAXLEN) +#define DEFINER_CHAR_LENGTH (USERNAME_CHAR_LENGTH + HOSTNAME_LENGTH + 1) +#define DEFINER_LENGTH (USERNAME_LENGTH + HOSTNAME_LENGTH + 1) #define MYSQL_AUTODETECT_CHARSET_NAME "auto" @@ -52,12 +54,8 @@ pluggable authentication, so any version starting from "5.5.5-" and claiming to support pluggable auth, must be using this fake prefix. */ -#ifdef EMBEDDED_LIBRARY -#define RPL_VERSION_HACK "" -#else /* this version must be the one that *does not* support pluggable auth */ #define RPL_VERSION_HACK "5.5.5-" -#endif #define SERVER_VERSION_LENGTH 60 #define SQLSTATE_LENGTH 5 diff --git a/include/mysql_time.h b/include/mysql_time.h index c92267232a1..6ccae8d5dc2 100644 --- a/include/mysql_time.h +++ b/include/mysql_time.h @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef _mysql_time_h_ #define _mysql_time_h_ diff --git a/include/t_ctype.h b/include/t_ctype.h index 15600019cd6..162adc7531c 100644 --- a/include/t_ctype.h +++ b/include/t_ctype.h @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ /* Copyright (C) 1998, 1999 by Pruet Boonma, all rights reserved. diff --git a/include/typelib.h b/include/typelib.h index 8aabc6fa059..4504bea4ff7 100644 --- a/include/typelib.h +++ b/include/typelib.h @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef _typelib_h |