mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
70823e1d91
The reason for the failure was a bug in an include file on debian that causes 'struct stat' to have different sized depending on the environment. This patch fixes so that we always include my_global.h or my_config.h before we include any other files. Other things: - Removed #include <my_global.h> in some include files; Better to always do this at the top level to have as few "always-include-this-file-first' files as possible. - Removed usage of some include files that where already included by my_global.h or by other files. client/mysql_plugin.c: Use my_global.h first client/mysqlslap.c: Remove duplicated include files extra/comp_err.c: Remove duplicated include files include/m_string.h: Remove duplicated include files include/maria.h: Remove duplicated include files libmysqld/emb_qcache.cc: Use my_global.h first plugin/semisync/semisync.h: Use my_pthread.h first sql/datadict.cc: Use my_global.h first sql/debug_sync.cc: Use my_global.h first sql/derror.cc: Use my_global.h first sql/des_key_file.cc: Use my_global.h first sql/discover.cc: Use my_global.h first sql/event_data_objects.cc: Use my_global.h first sql/event_db_repository.cc: Use my_global.h first sql/event_parse_data.cc: Use my_global.h first sql/event_queue.cc: Use my_global.h first sql/event_scheduler.cc: Use my_global.h first sql/events.cc: Use my_global.h first sql/field.cc: Use my_global.h first Remove duplicated include files sql/field_conv.cc: Use my_global.h first sql/filesort.cc: Use my_global.h first Remove duplicated include files sql/gstream.cc: Use my_global.h first sql/ha_ndbcluster.cc: Use my_global.h first sql/ha_ndbcluster_binlog.cc: Use my_global.h first sql/ha_ndbcluster_cond.cc: Use my_global.h first sql/ha_partition.cc: Use my_global.h first sql/handler.cc: Use my_global.h first sql/hash_filo.cc: Use my_global.h first sql/hostname.cc: Use my_global.h first sql/init.cc: Use my_global.h first sql/item.cc: Use my_global.h first sql/item_buff.cc: Use my_global.h first sql/item_cmpfunc.cc: Use my_global.h first sql/item_create.cc: Use my_global.h first sql/item_geofunc.cc: Use my_global.h first sql/item_inetfunc.cc: Use my_global.h first sql/item_row.cc: Use my_global.h first sql/item_strfunc.cc: Use my_global.h first sql/item_subselect.cc: Use my_global.h first sql/item_sum.cc: Use my_global.h first sql/item_timefunc.cc: Use my_global.h first sql/item_xmlfunc.cc: Use my_global.h first sql/key.cc: Use my_global.h first sql/lock.cc: Use my_global.h first sql/log.cc: Use my_global.h first sql/log_event.cc: Use my_global.h first sql/log_event_old.cc: Use my_global.h first sql/mf_iocache.cc: Use my_global.h first sql/mysql_install_db.cc: Remove duplicated include files sql/mysqld.cc: Remove duplicated include files sql/net_serv.cc: Remove duplicated include files sql/opt_range.cc: Use my_global.h first sql/opt_subselect.cc: Use my_global.h first sql/opt_sum.cc: Use my_global.h first sql/parse_file.cc: Use my_global.h first sql/partition_info.cc: Use my_global.h first sql/procedure.cc: Use my_global.h first sql/protocol.cc: Use my_global.h first sql/records.cc: Use my_global.h first sql/records.h: Don't include my_global.h Better to do this at the upper level sql/repl_failsafe.cc: Use my_global.h first sql/rpl_filter.cc: Use my_global.h first sql/rpl_gtid.cc: Use my_global.h first sql/rpl_handler.cc: Use my_global.h first sql/rpl_injector.cc: Use my_global.h first sql/rpl_record.cc: Use my_global.h first sql/rpl_record_old.cc: Use my_global.h first sql/rpl_reporting.cc: Use my_global.h first sql/rpl_rli.cc: Use my_global.h first sql/rpl_tblmap.cc: Use my_global.h first sql/rpl_utility.cc: Use my_global.h first sql/set_var.cc: Added comment sql/slave.cc: Use my_global.h first sql/sp.cc: Use my_global.h first sql/sp_cache.cc: Use my_global.h first sql/sp_head.cc: Use my_global.h first sql/sp_pcontext.cc: Use my_global.h first sql/sp_rcontext.cc: Use my_global.h first sql/spatial.cc: Use my_global.h first sql/sql_acl.cc: Use my_global.h first sql/sql_admin.cc: Use my_global.h first sql/sql_analyse.cc: Use my_global.h first sql/sql_audit.cc: Use my_global.h first sql/sql_base.cc: Use my_global.h first sql/sql_binlog.cc: Use my_global.h first sql/sql_bootstrap.cc: Use my_global.h first Use my_global.h first sql/sql_cache.cc: Use my_global.h first sql/sql_class.cc: Use my_global.h first sql/sql_client.cc: Use my_global.h first sql/sql_connect.cc: Use my_global.h first sql/sql_crypt.cc: Use my_global.h first sql/sql_cursor.cc: Use my_global.h first sql/sql_db.cc: Use my_global.h first sql/sql_delete.cc: Use my_global.h first sql/sql_derived.cc: Use my_global.h first sql/sql_do.cc: Use my_global.h first sql/sql_error.cc: Use my_global.h first sql/sql_explain.cc: Use my_global.h first sql/sql_expression_cache.cc: Use my_global.h first sql/sql_handler.cc: Use my_global.h first sql/sql_help.cc: Use my_global.h first sql/sql_insert.cc: Use my_global.h first sql/sql_lex.cc: Use my_global.h first sql/sql_load.cc: Use my_global.h first sql/sql_locale.cc: Use my_global.h first sql/sql_manager.cc: Use my_global.h first sql/sql_parse.cc: Use my_global.h first sql/sql_partition.cc: Use my_global.h first sql/sql_plugin.cc: Added comment sql/sql_prepare.cc: Use my_global.h first sql/sql_priv.h: Added error if we use this before including my_global.h This check is here becasue so many files includes sql_priv.h first. sql/sql_profile.cc: Use my_global.h first sql/sql_reload.cc: Use my_global.h first sql/sql_rename.cc: Use my_global.h first sql/sql_repl.cc: Use my_global.h first sql/sql_select.cc: Use my_global.h first sql/sql_servers.cc: Use my_global.h first sql/sql_show.cc: Added comment sql/sql_signal.cc: Use my_global.h first sql/sql_statistics.cc: Use my_global.h first sql/sql_table.cc: Use my_global.h first sql/sql_tablespace.cc: Use my_global.h first sql/sql_test.cc: Use my_global.h first sql/sql_time.cc: Use my_global.h first sql/sql_trigger.cc: Use my_global.h first sql/sql_udf.cc: Use my_global.h first sql/sql_union.cc: Use my_global.h first sql/sql_update.cc: Use my_global.h first sql/sql_view.cc: Use my_global.h first sql/sys_vars.cc: Added comment sql/table.cc: Use my_global.h first sql/thr_malloc.cc: Use my_global.h first sql/transaction.cc: Use my_global.h first sql/uniques.cc: Use my_global.h first sql/unireg.cc: Use my_global.h first sql/unireg.h: Removed inclusion of my_global.h storage/archive/ha_archive.cc: Added comment storage/blackhole/ha_blackhole.cc: Use my_global.h first storage/csv/ha_tina.cc: Use my_global.h first storage/csv/transparent_file.cc: Use my_global.h first storage/federated/ha_federated.cc: Use my_global.h first storage/federatedx/federatedx_io.cc: Use my_global.h first storage/federatedx/federatedx_io_mysql.cc: Use my_global.h first storage/federatedx/federatedx_io_null.cc: Use my_global.h first storage/federatedx/federatedx_txn.cc: Use my_global.h first storage/heap/ha_heap.cc: Use my_global.h first storage/innobase/handler/handler0alter.cc: Use my_global.h first storage/maria/ha_maria.cc: Use my_global.h first storage/maria/unittest/ma_maria_log_cleanup.c: Remove duplicated include files storage/maria/unittest/test_file.c: Added comment storage/myisam/ha_myisam.cc: Move sql_plugin.h first as this includes my_global.h storage/myisammrg/ha_myisammrg.cc: Use my_global.h first storage/oqgraph/oqgraph_thunk.cc: Use my_config.h and my_global.h first One could not include my_global.h before oqgraph_thunk.h (don't know why) storage/spider/ha_spider.cc: Use my_global.h first storage/spider/hs_client/config.cpp: Use my_global.h first storage/spider/hs_client/escape.cpp: Use my_global.h first storage/spider/hs_client/fatal.cpp: Use my_global.h first storage/spider/hs_client/hstcpcli.cpp: Use my_global.h first storage/spider/hs_client/socket.cpp: Use my_global.h first storage/spider/hs_client/string_util.cpp: Use my_global.h first storage/spider/spd_conn.cc: Use my_global.h first storage/spider/spd_copy_tables.cc: Use my_global.h first storage/spider/spd_db_conn.cc: Use my_global.h first storage/spider/spd_db_handlersocket.cc: Use my_global.h first storage/spider/spd_db_mysql.cc: Use my_global.h first storage/spider/spd_db_oracle.cc: Use my_global.h first storage/spider/spd_direct_sql.cc: Use my_global.h first storage/spider/spd_i_s.cc: Use my_global.h first storage/spider/spd_malloc.cc: Use my_global.h first storage/spider/spd_param.cc: Use my_global.h first storage/spider/spd_ping_table.cc: Use my_global.h first storage/spider/spd_sys_table.cc: Use my_global.h first storage/spider/spd_table.cc: Use my_global.h first storage/spider/spd_trx.cc: Use my_global.h first storage/xtradb/handler/handler0alter.cc: Use my_global.h first storage/xtradb/handler/i_s.cc: Use my_global.h first
234 lines
7.2 KiB
C
234 lines
7.2 KiB
C
/*
|
|
Copyright (c) 2000, 2012, Oracle and/or its affiliates.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
|
|
|
/* There may be prolems include all of theese. Try to test in
|
|
configure with ones are needed? */
|
|
|
|
/* This is needed for the definitions of strchr... on solaris */
|
|
|
|
#ifndef _m_string_h
|
|
#define _m_string_h
|
|
|
|
#include "my_global.h" /* HAVE_* */
|
|
|
|
#ifndef __USE_GNU
|
|
#define __USE_GNU /* We want to use stpcpy */
|
|
#endif
|
|
#if defined(HAVE_STRINGS_H)
|
|
#include <strings.h>
|
|
#endif
|
|
#if defined(HAVE_STRING_H)
|
|
#include <string.h>
|
|
#endif
|
|
|
|
/* This is needed for the definitions of memcpy... on solaris */
|
|
#if defined(HAVE_MEMORY_H) && !defined(__cplusplus)
|
|
#include <memory.h>
|
|
#endif
|
|
|
|
#if !defined(HAVE_MEMCPY) && !defined(HAVE_MEMMOVE)
|
|
# define memcpy(d, s, n) bcopy ((s), (d), (n))
|
|
# define memset(A,C,B) bfill((A),(B),(C))
|
|
# define memmove(d, s, n) bmove ((d), (s), (n))
|
|
#elif defined(HAVE_MEMMOVE)
|
|
# define bmove(d, s, n) memmove((d), (s), (n))
|
|
#endif
|
|
|
|
/* Unixware 7 */
|
|
#if !defined(HAVE_BFILL)
|
|
# define bfill(A,B,C) memset((A),(C),(B))
|
|
#endif
|
|
|
|
# define bmove_align(A,B,C) memcpy((A),(B),(C))
|
|
|
|
# define bcmp(A,B,C) memcmp((A),(B),(C))
|
|
|
|
#if !defined(bzero)
|
|
# define bzero(A,B) memset((A),0,(B))
|
|
#endif
|
|
|
|
#if defined(__cplusplus)
|
|
extern "C" {
|
|
#endif
|
|
|
|
/*
|
|
my_str_malloc(), my_str_realloc() and my_str_free() are assigned to
|
|
implementations in strings/alloc.c, but can be overridden in
|
|
the calling program.
|
|
*/
|
|
extern void *(*my_str_malloc)(size_t);
|
|
extern void *(*my_str_realloc)(void *, size_t);
|
|
extern void (*my_str_free)(void *);
|
|
|
|
#if defined(HAVE_STPCPY) && MY_GNUC_PREREQ(3, 4) && !defined(__INTEL_COMPILER)
|
|
#define strmov(A,B) __builtin_stpcpy((A),(B))
|
|
#elif defined(HAVE_STPCPY)
|
|
#define strmov(A,B) stpcpy((A),(B))
|
|
#endif
|
|
|
|
/* Declared in int2str() */
|
|
extern const char _dig_vec_upper[];
|
|
extern const char _dig_vec_lower[];
|
|
|
|
extern char *strmov_overlapp(char *dest, const char *src);
|
|
|
|
#if defined(_lint) || defined(FORCE_INIT_OF_VARS)
|
|
#define LINT_INIT_STRUCT(var) bzero(&var, sizeof(var)) /* No uninitialize-warning */
|
|
#else
|
|
#define LINT_INIT_STRUCT(var)
|
|
#endif
|
|
|
|
/* Prototypes for string functions */
|
|
|
|
extern void bmove_upp(uchar *dst,const uchar *src,size_t len);
|
|
extern void bchange(uchar *dst,size_t old_len,const uchar *src,
|
|
size_t new_len,size_t tot_len);
|
|
extern void strappend(char *s,size_t len,pchar fill);
|
|
extern char *strend(const char *s);
|
|
extern char *strcend(const char *, pchar);
|
|
extern char *strfill(char * s,size_t len,pchar fill);
|
|
extern char *strmake(char *dst,const char *src,size_t length);
|
|
|
|
#if !defined(__GNUC__) || (__GNUC__ < 4)
|
|
#define strmake_buf(D,S) strmake(D, S, sizeof(D) - 1)
|
|
#else
|
|
#define strmake_buf(D,S) ({ \
|
|
compile_time_assert(sizeof(D) != sizeof(char*)); \
|
|
strmake(D, S, sizeof(D) - 1); \
|
|
})
|
|
#endif
|
|
|
|
#ifndef strmov
|
|
extern char *strmov(char *dst,const char *src);
|
|
#endif
|
|
extern char *strnmov(char *dst, const char *src, size_t n);
|
|
extern char *strcont(const char *src, const char *set);
|
|
extern char *strxmov(char *dst, const char *src, ...);
|
|
extern char *strxnmov(char *dst, size_t len, const char *src, ...);
|
|
|
|
/* Prototypes of normal stringfunctions (with may ours) */
|
|
#ifndef HAVE_STRNLEN
|
|
extern size_t strnlen(const char *s, size_t n);
|
|
#endif
|
|
|
|
extern int is_prefix(const char *, const char *);
|
|
|
|
/* Conversion routines */
|
|
typedef enum {
|
|
MY_GCVT_ARG_FLOAT,
|
|
MY_GCVT_ARG_DOUBLE
|
|
} my_gcvt_arg_type;
|
|
|
|
double my_strtod(const char *str, char **end, int *error);
|
|
double my_atof(const char *nptr);
|
|
size_t my_fcvt(double x, int precision, char *to, my_bool *error);
|
|
size_t my_gcvt(double x, my_gcvt_arg_type type, int width, char *to,
|
|
my_bool *error);
|
|
|
|
#define NOT_FIXED_DEC 31
|
|
|
|
/*
|
|
The longest string my_fcvt can return is 311 + "precision" bytes.
|
|
Here we assume that we never cal my_fcvt() with precision >= NOT_FIXED_DEC
|
|
(+ 1 byte for the terminating '\0').
|
|
*/
|
|
#define FLOATING_POINT_BUFFER (311 + NOT_FIXED_DEC)
|
|
|
|
/*
|
|
We want to use the 'e' format in some cases even if we have enough space
|
|
for the 'f' one just to mimic sprintf("%.15g") behavior for large integers,
|
|
and to improve it for numbers < 10^(-4).
|
|
That is, for |x| < 1 we require |x| >= 10^(-15), and for |x| > 1 we require
|
|
it to be integer and be <= 10^DBL_DIG for the 'f' format to be used.
|
|
We don't lose precision, but make cases like "1e200" or "0.00001" look nicer.
|
|
*/
|
|
#define MAX_DECPT_FOR_F_FORMAT DBL_DIG
|
|
|
|
/*
|
|
The maximum possible field width for my_gcvt() conversion.
|
|
(DBL_DIG + 2) significant digits + sign + "." + ("e-NNN" or
|
|
MAX_DECPT_FOR_F_FORMAT zeros for cases when |x|<1 and the 'f' format is used).
|
|
*/
|
|
#define MY_GCVT_MAX_FIELD_WIDTH (DBL_DIG + 4 + MY_MAX(5, MAX_DECPT_FOR_F_FORMAT)) \
|
|
|
|
extern char *llstr(longlong value,char *buff);
|
|
extern char *ullstr(longlong value,char *buff);
|
|
#ifndef HAVE_STRTOUL
|
|
extern long strtol(const char *str, char **ptr, int base);
|
|
extern ulong strtoul(const char *str, char **ptr, int base);
|
|
#endif
|
|
|
|
extern char *int2str(long val, char *dst, int radix, int upcase);
|
|
extern char *int10_to_str(long val,char *dst,int radix);
|
|
extern char *str2int(const char *src,int radix,long lower,long upper,
|
|
long *val);
|
|
longlong my_strtoll10(const char *nptr, char **endptr, int *error);
|
|
#if SIZEOF_LONG == SIZEOF_LONG_LONG
|
|
#define ll2str(A,B,C,D) int2str((A),(B),(C),(D))
|
|
#define longlong10_to_str(A,B,C) int10_to_str((A),(B),(C))
|
|
#undef strtoll
|
|
#define strtoll(A,B,C) strtol((A),(B),(C))
|
|
#define strtoull(A,B,C) strtoul((A),(B),(C))
|
|
#ifndef HAVE_STRTOULL
|
|
#define HAVE_STRTOULL
|
|
#endif
|
|
#ifndef HAVE_STRTOLL
|
|
#define HAVE_STRTOLL
|
|
#endif
|
|
#else
|
|
#ifdef HAVE_LONG_LONG
|
|
extern char *ll2str(longlong val,char *dst,int radix, int upcase);
|
|
extern char *longlong10_to_str(longlong val,char *dst,int radix);
|
|
#if (!defined(HAVE_STRTOULL) || defined(NO_STRTOLL_PROTO))
|
|
extern longlong strtoll(const char *str, char **ptr, int base);
|
|
extern ulonglong strtoull(const char *str, char **ptr, int base);
|
|
#endif
|
|
#endif
|
|
#endif
|
|
#define longlong2str(A,B,C) ll2str((A),(B),(C),1)
|
|
|
|
#if defined(__cplusplus)
|
|
}
|
|
#endif
|
|
|
|
#include <mysql/plugin.h>
|
|
|
|
#define STRING_WITH_LEN(X) (X), ((size_t) (sizeof(X) - 1))
|
|
#define USTRING_WITH_LEN(X) ((uchar*) X), ((size_t) (sizeof(X) - 1))
|
|
#define C_STRING_WITH_LEN(X) ((char *) (X)), ((size_t) (sizeof(X) - 1))
|
|
|
|
struct st_mysql_const_lex_string
|
|
{
|
|
const char *str;
|
|
size_t length;
|
|
};
|
|
typedef struct st_mysql_const_lex_string LEX_CSTRING;
|
|
|
|
/* A variant with const and unsigned */
|
|
struct st_mysql_const_unsigned_lex_string
|
|
{
|
|
const uchar *str;
|
|
size_t length;
|
|
};
|
|
typedef struct st_mysql_const_unsigned_lex_string LEX_CUSTRING;
|
|
|
|
static inline void lex_string_set(LEX_STRING *lex_str, const char *c_str)
|
|
{
|
|
lex_str->str= (char *) c_str;
|
|
lex_str->length= strlen(c_str);
|
|
}
|
|
|
|
#endif
|