mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +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
266 lines
7 KiB
C
266 lines
7 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 */
|
|
|
|
#include <my_global.h>
|
|
#include <m_ctype.h>
|
|
#include <my_xml.h>
|
|
#ifndef SCO
|
|
#include <m_string.h>
|
|
#endif
|
|
|
|
|
|
|
|
static char *mstr(char *str,const char *src,uint l1,uint l2)
|
|
{
|
|
l1= l1<l2 ? l1 : l2;
|
|
memcpy(str,src,l1);
|
|
str[l1]='\0';
|
|
return str;
|
|
}
|
|
|
|
struct my_cs_file_section_st
|
|
{
|
|
int state;
|
|
const char *str;
|
|
};
|
|
|
|
#define _CS_MISC 1
|
|
#define _CS_ID 2
|
|
#define _CS_CSNAME 3
|
|
#define _CS_FAMILY 4
|
|
#define _CS_ORDER 5
|
|
#define _CS_COLNAME 6
|
|
#define _CS_FLAG 7
|
|
#define _CS_CHARSET 8
|
|
#define _CS_COLLATION 9
|
|
#define _CS_UPPERMAP 10
|
|
#define _CS_LOWERMAP 11
|
|
#define _CS_UNIMAP 12
|
|
#define _CS_COLLMAP 13
|
|
#define _CS_CTYPEMAP 14
|
|
#define _CS_PRIMARY_ID 15
|
|
#define _CS_BINARY_ID 16
|
|
#define _CS_CSDESCRIPT 17
|
|
|
|
static struct my_cs_file_section_st sec[] =
|
|
{
|
|
{_CS_MISC, "xml"},
|
|
{_CS_MISC, "xml.version"},
|
|
{_CS_MISC, "xml.encoding"},
|
|
{_CS_MISC, "charsets"},
|
|
{_CS_MISC, "charsets.max-id"},
|
|
{_CS_CHARSET, "charsets.charset"},
|
|
{_CS_PRIMARY_ID, "charsets.charset.primary-id"},
|
|
{_CS_BINARY_ID, "charsets.charset.binary-id"},
|
|
{_CS_CSNAME, "charsets.charset.name"},
|
|
{_CS_FAMILY, "charsets.charset.family"},
|
|
{_CS_CSDESCRIPT, "charsets.charset.description"},
|
|
{_CS_MISC, "charsets.charset.alias"},
|
|
{_CS_MISC, "charsets.charset.ctype"},
|
|
{_CS_CTYPEMAP, "charsets.charset.ctype.map"},
|
|
{_CS_MISC, "charsets.charset.upper"},
|
|
{_CS_UPPERMAP, "charsets.charset.upper.map"},
|
|
{_CS_MISC, "charsets.charset.lower"},
|
|
{_CS_LOWERMAP, "charsets.charset.lower.map"},
|
|
{_CS_MISC, "charsets.charset.unicode"},
|
|
{_CS_UNIMAP, "charsets.charset.unicode.map"},
|
|
{_CS_COLLATION, "charsets.charset.collation"},
|
|
{_CS_COLNAME, "charsets.charset.collation.name"},
|
|
{_CS_ID, "charsets.charset.collation.id"},
|
|
{_CS_ORDER, "charsets.charset.collation.order"},
|
|
{_CS_FLAG, "charsets.charset.collation.flag"},
|
|
{_CS_COLLMAP, "charsets.charset.collation.map"},
|
|
{0, NULL}
|
|
};
|
|
|
|
static struct my_cs_file_section_st * cs_file_sec(const char *attr, uint len)
|
|
{
|
|
struct my_cs_file_section_st *s;
|
|
for (s=sec; s->str; s++)
|
|
{
|
|
if (!strncmp(attr,s->str,len))
|
|
return s;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
#define MY_CS_CSDESCR_SIZE 64
|
|
|
|
typedef struct my_cs_file_info
|
|
{
|
|
char csname[MY_CS_NAME_SIZE];
|
|
char name[MY_CS_NAME_SIZE];
|
|
uchar ctype[MY_CS_CTYPE_TABLE_SIZE];
|
|
uchar to_lower[MY_CS_TO_LOWER_TABLE_SIZE];
|
|
uchar to_upper[MY_CS_TO_UPPER_TABLE_SIZE];
|
|
uchar sort_order[MY_CS_SORT_ORDER_TABLE_SIZE];
|
|
uint16 tab_to_uni[MY_CS_TO_UNI_TABLE_SIZE];
|
|
char comment[MY_CS_CSDESCR_SIZE];
|
|
CHARSET_INFO cs;
|
|
int (*add_collation)(CHARSET_INFO *cs);
|
|
} MY_CHARSET_LOADER;
|
|
|
|
|
|
|
|
static int fill_uchar(uchar *a,uint size,const char *str, uint len)
|
|
{
|
|
uint i= 0;
|
|
const char *s, *b, *e=str+len;
|
|
|
|
for (s=str ; s < e ; i++)
|
|
{
|
|
for ( ; (s < e) && strchr(" \t\r\n",s[0]); s++) ;
|
|
b=s;
|
|
for ( ; (s < e) && !strchr(" \t\r\n",s[0]); s++) ;
|
|
if (s == b || i > size)
|
|
break;
|
|
a[i]= (uchar) strtoul(b,NULL,16);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int fill_uint16(uint16 *a,uint size,const char *str, uint len)
|
|
{
|
|
uint i= 0;
|
|
|
|
const char *s, *b, *e=str+len;
|
|
for (s=str ; s < e ; i++)
|
|
{
|
|
for ( ; (s < e) && strchr(" \t\r\n",s[0]); s++) ;
|
|
b=s;
|
|
for ( ; (s < e) && !strchr(" \t\r\n",s[0]); s++) ;
|
|
if (s == b || i > size)
|
|
break;
|
|
a[i]= (uint16) strtol(b,NULL,16);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int cs_enter(MY_XML_PARSER *st,const char *attr, uint len)
|
|
{
|
|
struct my_cs_file_info *i= (struct my_cs_file_info *)st->user_data;
|
|
struct my_cs_file_section_st *s= cs_file_sec(attr,len);
|
|
|
|
if ( s && (s->state == _CS_CHARSET))
|
|
{
|
|
bzero(&i->cs,sizeof(i->cs));
|
|
}
|
|
return MY_XML_OK;
|
|
}
|
|
|
|
|
|
static int cs_leave(MY_XML_PARSER *st,const char *attr, uint len)
|
|
{
|
|
struct my_cs_file_info *i= (struct my_cs_file_info *)st->user_data;
|
|
struct my_cs_file_section_st *s= cs_file_sec(attr,len);
|
|
int state= s ? s->state : 0;
|
|
int rc;
|
|
|
|
switch(state){
|
|
case _CS_COLLATION:
|
|
rc= i->add_collation ? i->add_collation(&i->cs) : MY_XML_OK;
|
|
break;
|
|
default:
|
|
rc=MY_XML_OK;
|
|
}
|
|
return rc;
|
|
}
|
|
|
|
|
|
static int cs_value(MY_XML_PARSER *st,const char *attr, uint len)
|
|
{
|
|
struct my_cs_file_info *i= (struct my_cs_file_info *)st->user_data;
|
|
struct my_cs_file_section_st *s;
|
|
int state= (s=cs_file_sec(st->attr,strlen(st->attr))) ? s->state : 0;
|
|
|
|
#ifndef DBUG_OFF
|
|
if(0){
|
|
char str[1024];
|
|
mstr(str,attr,len,sizeof(str)-1);
|
|
printf("VALUE %d %s='%s'\n",state,st->attr,str);
|
|
}
|
|
#endif
|
|
|
|
switch (state) {
|
|
case _CS_ID:
|
|
i->cs.number= strtol(attr,(char**)NULL,10);
|
|
break;
|
|
case _CS_BINARY_ID:
|
|
i->cs.binary_number= strtol(attr,(char**)NULL,10);
|
|
break;
|
|
case _CS_PRIMARY_ID:
|
|
i->cs.primary_number= strtol(attr,(char**)NULL,10);
|
|
break;
|
|
case _CS_COLNAME:
|
|
i->cs.name=mstr(i->name,attr,len,MY_CS_NAME_SIZE-1);
|
|
break;
|
|
case _CS_CSNAME:
|
|
i->cs.csname=mstr(i->csname,attr,len,MY_CS_NAME_SIZE-1);
|
|
break;
|
|
case _CS_CSDESCRIPT:
|
|
i->cs.comment=mstr(i->comment,attr,len,MY_CS_CSDESCR_SIZE-1);
|
|
break;
|
|
case _CS_FLAG:
|
|
if (!strncmp("primary",attr,len))
|
|
i->cs.state|= MY_CS_PRIMARY;
|
|
else if (!strncmp("binary",attr,len))
|
|
i->cs.state|= MY_CS_BINSORT;
|
|
else if (!strncmp("compiled",attr,len))
|
|
i->cs.state|= MY_CS_COMPILED;
|
|
break;
|
|
case _CS_UPPERMAP:
|
|
fill_uchar(i->to_upper,MY_CS_TO_UPPER_TABLE_SIZE,attr,len);
|
|
i->cs.to_upper=i->to_upper;
|
|
break;
|
|
case _CS_LOWERMAP:
|
|
fill_uchar(i->to_lower,MY_CS_TO_LOWER_TABLE_SIZE,attr,len);
|
|
i->cs.to_lower=i->to_lower;
|
|
break;
|
|
case _CS_UNIMAP:
|
|
fill_uint16(i->tab_to_uni,MY_CS_TO_UNI_TABLE_SIZE,attr,len);
|
|
i->cs.tab_to_uni=i->tab_to_uni;
|
|
break;
|
|
case _CS_COLLMAP:
|
|
fill_uchar(i->sort_order,MY_CS_SORT_ORDER_TABLE_SIZE,attr,len);
|
|
i->cs.sort_order=i->sort_order;
|
|
break;
|
|
case _CS_CTYPEMAP:
|
|
fill_uchar(i->ctype,MY_CS_CTYPE_TABLE_SIZE,attr,len);
|
|
i->cs.ctype=i->ctype;
|
|
break;
|
|
}
|
|
return MY_XML_OK;
|
|
}
|
|
|
|
|
|
my_bool my_parse_charset_xml(const char *buf, uint len,
|
|
int (*add_collation)(CHARSET_INFO *cs))
|
|
{
|
|
MY_XML_PARSER p;
|
|
struct my_cs_file_info i;
|
|
my_bool rc;
|
|
|
|
my_xml_parser_create(&p);
|
|
my_xml_set_enter_handler(&p,cs_enter);
|
|
my_xml_set_value_handler(&p,cs_value);
|
|
my_xml_set_leave_handler(&p,cs_leave);
|
|
i.add_collation= add_collation;
|
|
my_xml_set_user_data(&p,(void*)&i);
|
|
rc= (my_xml_parse(&p,buf,len) == MY_XML_OK) ? FALSE : TRUE;
|
|
my_xml_parser_free(&p);
|
|
return rc;
|
|
}
|