database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1

Browse Source 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
This commit is contained in:
jani@a88-113-38-195.elisa-laajakaista.fi
2007-05-24 13:24:36 +03:00
parent 2ff938d21c 088e2395f1
commit fc3b3a0a86
478 changed files with 8584 additions and 8306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_lex.h
View File

@ -221,7 +221,7 @@ enum tablespace_op_type
Keep in sync with index_hint_type.
*/
extern const char * index_hint_type_name[];
typedef byte index_clause_map;
typedef uchar index_clause_map;
/*
Bits in index_clause_map : one for each possible FOR clause in
@ -409,7 +409,7 @@ public:
static void *operator new(size_t size)
{
return (void*) sql_alloc((uint) size);
return sql_alloc(size);
}
static void *operator new(size_t size, MEM_ROOT *mem_root)
{ return (void*) alloc_root(mem_root, (uint) size); }
@ -733,7 +733,7 @@ public:
{
order_list.elements= 0;
order_list.first= 0;
order_list.next= (byte**) &order_list.first;
order_list.next= (uchar**) &order_list.first;
}
/*
This method created for reiniting LEX in mysql_admin_table() and can be
@ -913,7 +913,7 @@ public:
in which it was right after query parsing.
*/
SQL_LIST sroutines_list;
byte **sroutines_list_own_last;
uchar **sroutines_list_own_last;
uint sroutines_list_own_elements;
/*
@ -1078,7 +1078,7 @@ typedef struct st_lex : public Query_tables_list
LEX_STRING comment, ident;
LEX_USER *grant_user;
XID *xid;
gptr yacc_yyss,yacc_yyvs;
uchar* yacc_yyss, *yacc_yyvs;
THD *thd;
/* maintain a list of used plugins for this LEX */
@ -1368,7 +1368,7 @@ struct st_lex_local: public st_lex
{
static void *operator new(size_t size)
{
return (void*) sql_alloc((uint) size);
return sql_alloc(size);
}
static void *operator new(size_t size, MEM_ROOT *mem_root)
{