mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
b388eb004d
bmove_allign -> bmove_align Added OLAP function ROLLUP Split mysql_fix_privilege_tables to a script and a .sql data file Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects. Added table_alias_charset, for easier --lower-case-table-name handling Better SQL_MODE handling (Setting complex options also sets sub options) New (faster) assembler string functions for x86 BitKeeper/etc/ignore: added libmysqld/sql_state.c client/mysql.cc: Added SQLSTATE to error messages Added new function put_error() to be able to clean up some old code. client/mysqltest.c: Write ERROR SQLSTATE for all errors dbug/dbug.c: Portability fixes include/m_string.h: Rename bmove_allign as bmove_align include/mysql.h: Added SQLSTATE (for embedded version) include/mysql_com.h: Send correct SQLSTATE for the error to the client libmysql/libmysql.c: Changed default error state to HY000 Applied code cleanup patch libmysqld/Makefile.am: Added sql_state.cc libmysqld/libmysqld.c: Added sqlstate mysql-test/r/analyse.result: Updated results mysql-test/r/ansi.result: Updated results mysql-test/r/auto_increment.result: Updated results mysql-test/r/bdb-deadlock.result: Updated results mysql-test/r/bdb.result: Updated results mysql-test/r/comments.result: Updated results mysql-test/r/create.result: Updated results mysql-test/r/ctype_collate.result: Updated results mysql-test/r/delayed.result: Updated results mysql-test/r/delete.result: Updated results mysql-test/r/derived.result: Updated results mysql-test/r/distinct.result: Updated results mysql-test/r/drop.result: Updated results mysql-test/r/err000001.result: Updated results mysql-test/r/explain.result: Updated results mysql-test/r/flush.result: Updated results mysql-test/r/fulltext.result: Updated results mysql-test/r/func_gconcat.result: Updated results mysql-test/r/func_system.result: Updated results mysql-test/r/grant_cache.result: Updated results mysql-test/r/group_by.result: Updated results mysql-test/r/handler.result: Updated results mysql-test/r/heap.result: Updated results mysql-test/r/heap_btree.result: Updated results mysql-test/r/heap_hash.result: Updated results mysql-test/r/innodb.result: Updated results mysql-test/r/innodb_handler.result: Updated results mysql-test/r/insert_select.result: Updated results mysql-test/r/insert_update.result: Updated results mysql-test/r/join.result: Updated results mysql-test/r/join_outer.result: Updated results mysql-test/r/key.result: Updated results mysql-test/r/lock.result: Updated results mysql-test/r/lock_multi.result: Updated results mysql-test/r/merge.result: Updated results mysql-test/r/multi_update.result: Updated results mysql-test/r/myisam.result: Updated results mysql-test/r/null.result: Updated results mysql-test/r/olap.result: Updated results mysql-test/r/order_by.result: Updated results mysql-test/r/packet.result: Updated results mysql-test/r/query_cache.result: Updated results mysql-test/r/row.result: Updated results mysql-test/r/rpl000001.result: Updated results mysql-test/r/rpl000009.result: Updated results mysql-test/r/rpl_empty_master_crash.result: Updated results mysql-test/r/rpl_log.result: Updated results mysql-test/r/rpl_replicate_do.result: Updated results mysql-test/r/rpl_rotate_logs.result: Updated results mysql-test/r/select.result: Updated results mysql-test/r/select_safe.result: Updated results mysql-test/r/show_check.result: Updated results mysql-test/r/sql_mode.result: Updated results mysql-test/r/subselect.result: Updated results mysql-test/r/temp_table.result: Updated results mysql-test/r/truncate.result: Updated results mysql-test/r/type_blob.result: Updated results mysql-test/r/type_decimal.result: Updated results mysql-test/r/type_float.result: Updated results mysql-test/r/type_ranges.result: Updated results mysql-test/r/union.result: Updated results mysql-test/r/update.result: Updated results mysql-test/r/user_var.result: Updated results mysql-test/r/varbinary.result: Updated results mysql-test/r/variables.result: Updated results mysql-test/t/ansi.test: Test of sql_mode mysql-test/t/derived.test: Updated results mysql-test/t/func_system.test: Make this independen of the MySQL server name mysql-test/t/lowercase_table.test: Cleanup mysql-test/t/olap.test: A lot of new tests mysql-test/t/sql_mode.test: More test for sql_mode mysql-test/t/subselect.test: Added a few new tests (to find a bug in the item_ref code) scripts/Makefile.am: Added mysql_fix_privilege_tables.sql scripts/mysql_fix_privilege_tables.sh: Totally new script. This bascily just pipes mysql_fix_privilege_tables.sql through 'mysql' to 'mysqld' sql/Makefile.am: Added sql_state.cc sql/item.cc: Extended Item_field::eq() to be able to better match GROUP BY fields on the command line. Needed for ROLLUP sql/item.h: Added function to be able to avoid calling current_thd() when doing new Item. sql/item_sum.cc: Moved copy_or_same() and some reset() functions from item_sum.h Needed to be able to access thd->mem_root. sql/item_sum.h: Moved some functions to item_sum.cc Added make_unique() for ROLLUP sql/item_uniq.h: Fixed return value sql/mysql_priv.h: Updated MODE flags sql/mysqld.cc: Added ANSI as it's own mode Moved charset_info variables here Cleaned up handler_count handling (for NT) Added table_alias_charset, for easier --lower-case-table-name handling sql/net_serv.cc: New comment sql/protocol.cc: Send SQLSTATE to client sql/set_var.cc: Better SQL_MODE handling (Setting complex options also sets sub options) sql/set_var.h: Better SQL_MODE handling sql/sql_base.cc: Make alias depend on --lower-case-table-names Make find_item_in_list also check database name sql/sql_cache.cc: Indentation cleanup sql/sql_list.h: Added safety assert Addes support of alloc without current_thd() sql/sql_prepare.cc: Update after prototype change sql/sql_select.cc: Added ROLLUP sql/sql_select.h: structures for rollup sql/sql_show.cc: Easier SQL_MODE handling sql/sql_string.cc: Move CHARSET_INFO to mysqld (to be together with all other global variables) sql/sql_string.h: Added function to be able to avoid calling current_thd() when doing new Item. sql/sql_table.cc: Simpler --lower-case-table-name handling sql/sql_union.cc: Update after prototype change sql/sql_yacc.yy: ROLLUP sql/unireg.h: bmove_allign ->bmove_align strings/Makefile.am: Fix to be able to compile str_test.c strings/ctype.c: Removed empty lines strings/str_test.c: Added test of bmove_align strings/strings-x86.s: Faster bmove_align, bmove_upp and strmake strings/strings.asm: move_allg
253 lines
7.6 KiB
C
253 lines
7.6 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
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; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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
|
|
#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
|
|
|
|
/* need by my_vsnprintf */
|
|
#include <stdarg.h>
|
|
|
|
/* Correct some things for UNIXWARE7 */
|
|
#ifdef HAVE_UNIXWARE7_THREADS
|
|
#undef HAVE_STRINGS_H
|
|
#undef HAVE_MEMORY_H
|
|
#define HAVE_MEMCPY
|
|
#ifndef HAVE_MEMMOVE
|
|
#define HAVE_MEMMOVE
|
|
#endif
|
|
#undef HAVE_BCMP
|
|
#undef bcopy
|
|
#undef bcmp
|
|
#undef bzero
|
|
#endif /* HAVE_UNIXWARE7_THREADS */
|
|
#ifdef _AIX
|
|
#undef HAVE_BCMP
|
|
#endif
|
|
|
|
/* This is needed for the definitions of bzero... on solaris */
|
|
#if defined(HAVE_STRINGS_H) && !defined(HAVE_mit_thread)
|
|
#include <strings.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))
|
|
#else
|
|
# define memmove(d, s, n) bmove((d), (s), (n)) /* our bmove */
|
|
#endif
|
|
|
|
/* Unixware 7 */
|
|
#if !defined(HAVE_BFILL)
|
|
# define bfill(A,B,C) memset((A),(C),(B))
|
|
# define bmove_align(A,B,C) memcpy((A),(B),(C))
|
|
#endif
|
|
|
|
#if !defined(HAVE_BCMP)
|
|
# define bcopy(s, d, n) memcpy((d), (s), (n))
|
|
# define bcmp(A,B,C) memcmp((A),(B),(C))
|
|
# define bzero(A,B) memset((A),0,(B))
|
|
# define bmove_align(A,B,C) memcpy((A),(B),(C))
|
|
#endif
|
|
|
|
#if defined(__cplusplus) && !defined(OS2)
|
|
extern "C" {
|
|
#endif
|
|
|
|
#if defined(HAVE_STPCPY) && !defined(HAVE_mit_thread)
|
|
#define strmov(A,B) stpcpy((A),(B))
|
|
#ifndef stpcpy
|
|
extern char *stpcpy(char *, const char *); /* For AIX with gcc 2.95.3 */
|
|
#endif
|
|
#endif
|
|
|
|
extern char NEAR _dig_vec[]; /* Declared in int2str() */
|
|
|
|
#ifdef BAD_STRING_COMPILER
|
|
#define strmov(A,B) (memccpy(A,B,0,INT_MAX)-1)
|
|
#else
|
|
#define strmov_overlapp(A,B) strmov(A,B)
|
|
#define strmake_overlapp(A,B,C) strmake(A,B,C)
|
|
#endif
|
|
|
|
#ifdef BAD_MEMCPY /* Problem with gcc on Alpha */
|
|
#define memcpy_fixed(A,B,C) bmove((A),(B),(C))
|
|
#else
|
|
#define memcpy_fixed(A,B,C) memcpy((A),(B),(C))
|
|
#endif
|
|
|
|
#ifdef MSDOS
|
|
#undef bmove_align
|
|
#define bmove512(A,B,C) bmove_align(A,B,C)
|
|
#define my_itoa(A,B,C) itoa(A,B,C)
|
|
#define my_ltoa(A,B,C) ltoa(A,B,C)
|
|
extern void bmove_align(gptr dst,const gptr src,uint len);
|
|
#endif
|
|
|
|
#if (!defined(USE_BMOVE512) || defined(HAVE_purify)) && !defined(bmove512)
|
|
#define bmove512(A,B,C) memcpy(A,B,C)
|
|
#endif
|
|
|
|
/* Prototypes for string functions */
|
|
|
|
#if !defined(bfill) && !defined(HAVE_BFILL)
|
|
extern void bfill(gptr dst,uint len,pchar fill);
|
|
#endif
|
|
|
|
#if !defined(bzero) && !defined(HAVE_BZERO)
|
|
extern void bzero(gptr dst,uint len);
|
|
#endif
|
|
|
|
#if !defined(bcmp) && !defined(HAVE_BCMP)
|
|
extern int bcmp(const char *s1,const char *s2,uint len);
|
|
#endif
|
|
#ifdef HAVE_purify
|
|
extern int my_bcmp(const char *s1,const char *s2,uint len);
|
|
#undef bcmp
|
|
#define bcmp(A,B,C) my_bcmp((A),(B),(C))
|
|
#endif
|
|
|
|
#ifndef bmove512
|
|
extern void bmove512(gptr dst,const gptr src,uint len);
|
|
#endif
|
|
|
|
#if !defined(HAVE_BMOVE) && !defined(bmove)
|
|
extern void bmove(char *dst, const char *src,uint len);
|
|
#endif
|
|
|
|
extern void bmove_upp(char *dst,const char *src,uint len);
|
|
extern void bchange(char *dst,uint old_len,const char *src,
|
|
uint new_len,uint tot_len);
|
|
extern void strappend(char *s,uint len,pchar fill);
|
|
extern char *strend(const char *s);
|
|
extern char *strcend(const char *, pchar);
|
|
extern char *strfield(char *src,int fields,int chars,int blanks,
|
|
int tabch);
|
|
extern char *strfill(my_string s,uint len,pchar fill);
|
|
extern uint strinstr(const char *str,const char *search);
|
|
extern uint r_strinstr(reg1 my_string str,int from, reg4 my_string search);
|
|
extern char *strkey(char *dst,char *head,char *tail,char *flags);
|
|
extern char *strmake(char *dst,const char *src,uint length);
|
|
#ifndef strmake_overlapp
|
|
extern char *strmake_overlapp(char *dst,const char *src, uint length);
|
|
#endif
|
|
|
|
#ifndef strmov
|
|
extern char *strmov(char *dst,const char *src);
|
|
#endif
|
|
extern char *strnmov(char *dst,const char *src,uint n);
|
|
extern char *strsuff(const char *src,const char *suffix);
|
|
extern char *strcont(const char *src,const char *set);
|
|
extern char *strxcat _VARARGS((char *dst,const char *src, ...));
|
|
extern char *strxmov _VARARGS((char *dst,const char *src, ...));
|
|
extern char *strxcpy _VARARGS((char *dst,const char *src, ...));
|
|
extern char *strxncat _VARARGS((char *dst,uint len, const char *src, ...));
|
|
extern char *strxnmov _VARARGS((char *dst,uint len, const char *src, ...));
|
|
extern char *strxncpy _VARARGS((char *dst,uint len, const char *src, ...));
|
|
|
|
/* Prototypes of normal stringfunctions (with may ours) */
|
|
|
|
#ifdef WANT_STRING_PROTOTYPES
|
|
extern char *strcat(char *, const char *);
|
|
extern char *strchr(const char *, pchar);
|
|
extern char *strrchr(const char *, pchar);
|
|
extern char *strcpy(char *, const char *);
|
|
extern int strcmp(const char *, const char *);
|
|
#ifndef __GNUC__
|
|
extern size_t strlen(const char *);
|
|
#endif
|
|
#endif
|
|
#ifndef HAVE_STRNLEN
|
|
extern uint strnlen(const char *s, uint n);
|
|
#endif
|
|
|
|
#if !defined(__cplusplus)
|
|
#ifndef HAVE_STRPBRK
|
|
extern char *strpbrk(const char *, const char *);
|
|
#endif
|
|
#ifndef HAVE_STRSTR
|
|
extern char *strstr(const char *, const char *);
|
|
#endif
|
|
#endif
|
|
extern int is_prefix(const char *, const char *);
|
|
|
|
/* Conversion rutins */
|
|
|
|
#ifdef USE_MY_ITOA
|
|
extern char *my_itoa(int val,char *dst,int radix);
|
|
extern char *my_ltoa(long val,char *dst,int radix);
|
|
#endif
|
|
|
|
extern char *llstr(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);
|
|
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);
|
|
#if SIZEOF_LONG == SIZEOF_LONG_LONG
|
|
#define longlong2str(A,B,C) int2str((A),(B),(C))
|
|
#define longlong10_to_str(A,B,C) int10_to_str((A),(B),(C))
|
|
#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
|
|
#else
|
|
#ifdef HAVE_LONG_LONG
|
|
extern char *longlong2str(longlong val,char *dst,int radix);
|
|
extern char *longlong10_to_str(longlong val,char *dst,int radix);
|
|
#if (!defined(HAVE_STRTOULL) || defined(HAVE_mit_thread)) || 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
|
|
|
|
/* my_vsnprintf.c */
|
|
|
|
extern int my_vsnprintf( char *str, size_t n,
|
|
const char *format, va_list ap );
|
|
extern int my_snprintf(char* to, size_t n, const char* fmt, ...);
|
|
|
|
#if defined(__cplusplus) && !defined(OS2)
|
|
}
|
|
#endif
|
|
#endif
|