mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22: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
390 lines
9.6 KiB
C++
390 lines
9.6 KiB
C++
/* Copyright (C) 2000-2003 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 */
|
|
|
|
|
|
/* mysql standard open memoryallocator */
|
|
|
|
#ifdef __GNUC__
|
|
#pragma interface /* gcc class implementation */
|
|
#endif
|
|
|
|
|
|
class Sql_alloc
|
|
{
|
|
public:
|
|
static void *operator new(size_t size)
|
|
{
|
|
return (void*) sql_alloc((uint) size);
|
|
}
|
|
static void *operator new[](size_t size)
|
|
{
|
|
return (void*) sql_alloc((uint) size);
|
|
}
|
|
static void *operator new(size_t size, MEM_ROOT *mem_root)
|
|
{ return (void*) alloc_root(mem_root, (uint) size); }
|
|
static void operator delete(void *ptr, size_t size) {} /*lint -e715 */
|
|
static void operator delete[](void *ptr, size_t size) {}
|
|
#ifdef HAVE_purify
|
|
bool dummy;
|
|
inline Sql_alloc() :dummy(0) {}
|
|
inline ~Sql_alloc() {}
|
|
#else
|
|
inline Sql_alloc() {}
|
|
inline ~Sql_alloc() {}
|
|
#endif
|
|
|
|
};
|
|
|
|
/*
|
|
** basic single linked list
|
|
** Used for item and item_buffs.
|
|
** All list ends with a pointer to the 'end_of_list' element, which
|
|
** data pointer is a null pointer and the next pointer points to itself.
|
|
** This makes it very fast to traverse lists as we don't have to
|
|
** test for a specialend condition for list that can't contain a null
|
|
** pointer.
|
|
*/
|
|
|
|
class list_node :public Sql_alloc
|
|
{
|
|
public:
|
|
list_node *next;
|
|
void *info;
|
|
list_node(void *info_par,list_node *next_par)
|
|
:next(next_par),info(info_par)
|
|
{}
|
|
list_node() /* For end_of_list */
|
|
{
|
|
info=0;
|
|
next= this;
|
|
}
|
|
friend class base_list;
|
|
friend class base_list_iterator;
|
|
};
|
|
|
|
extern list_node end_of_list;
|
|
|
|
class base_list :public Sql_alloc {
|
|
protected:
|
|
list_node *first,**last;
|
|
|
|
public:
|
|
uint elements;
|
|
|
|
inline void empty() { elements=0; first= &end_of_list; last=&first;}
|
|
inline base_list() { empty(); }
|
|
inline base_list(const base_list &tmp) :Sql_alloc()
|
|
{
|
|
elements=tmp.elements;
|
|
first=tmp.first;
|
|
last=tmp.last;
|
|
}
|
|
inline base_list(bool error) { }
|
|
inline bool push_back(void *info)
|
|
{
|
|
if (((*last)=new list_node(info, &end_of_list)))
|
|
{
|
|
last= &(*last)->next;
|
|
elements++;
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
inline bool push_front(void *info)
|
|
{
|
|
list_node *node=new list_node(info,first);
|
|
if (node)
|
|
{
|
|
if (last == &first)
|
|
last= &node->next;
|
|
first=node;
|
|
elements++;
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
void remove(list_node **prev)
|
|
{
|
|
list_node *node=(*prev)->next;
|
|
delete *prev;
|
|
*prev=node;
|
|
if (!--elements)
|
|
last= &first;
|
|
}
|
|
inline void *pop(void)
|
|
{
|
|
if (first == &end_of_list) return 0;
|
|
list_node *tmp=first;
|
|
first=first->next;
|
|
if (!--elements)
|
|
last= &first;
|
|
return tmp->info;
|
|
}
|
|
inline list_node* last_node() { return *last; }
|
|
inline list_node* first_node() { return first;}
|
|
inline void *head() { return first->info; }
|
|
inline void **head_ref() { return first != &end_of_list ? &first->info : 0; }
|
|
inline bool is_empty() { return first == &end_of_list ; }
|
|
inline list_node *last_ref() { return &end_of_list; }
|
|
friend class base_list_iterator;
|
|
friend class error_list;
|
|
friend class error_list_iterator;
|
|
|
|
protected:
|
|
void after(void *info,list_node *node)
|
|
{
|
|
list_node *new_node=new list_node(info,node->next);
|
|
node->next=new_node;
|
|
elements++;
|
|
if (last == &(node->next))
|
|
last= &new_node->next;
|
|
}
|
|
};
|
|
|
|
|
|
class base_list_iterator
|
|
{
|
|
protected:
|
|
base_list *list;
|
|
list_node **el,**prev,*current;
|
|
void sublist(base_list &ls, uint elm)
|
|
{
|
|
ls.first= *el;
|
|
ls.last= list->last;
|
|
ls.elements= elm;
|
|
}
|
|
public:
|
|
base_list_iterator(base_list &list_par)
|
|
:list(&list_par), el(&list_par.first), prev(0), current(0)
|
|
{}
|
|
|
|
inline void *next(void)
|
|
{
|
|
prev=el;
|
|
current= *el;
|
|
el= ¤t->next;
|
|
return current->info;
|
|
}
|
|
inline void *next_fast(void)
|
|
{
|
|
list_node *tmp;
|
|
tmp= *el;
|
|
el= &tmp->next;
|
|
return tmp->info;
|
|
}
|
|
inline void rewind(void)
|
|
{
|
|
el= &list->first;
|
|
}
|
|
inline void *replace(void *element)
|
|
{ // Return old element
|
|
void *tmp=current->info;
|
|
DBUG_ASSERT(current->info != 0);
|
|
current->info=element;
|
|
return tmp;
|
|
}
|
|
void *replace(base_list &new_list)
|
|
{
|
|
void *ret_value=current->info;
|
|
if (!new_list.is_empty())
|
|
{
|
|
*new_list.last=current->next;
|
|
current->info=new_list.first->info;
|
|
current->next=new_list.first->next;
|
|
if ((list->last == ¤t->next) && (new_list.elements > 1))
|
|
list->last= new_list.last;
|
|
list->elements+=new_list.elements-1;
|
|
}
|
|
return ret_value; // return old element
|
|
}
|
|
inline void remove(void) // Remove current
|
|
{
|
|
list->remove(prev);
|
|
el=prev;
|
|
current=0; // Safeguard
|
|
}
|
|
void after(void *element) // Insert element after current
|
|
{
|
|
list->after(element,current);
|
|
current=current->next;
|
|
el= ¤t->next;
|
|
}
|
|
inline void **ref(void) // Get reference pointer
|
|
{
|
|
return ¤t->info;
|
|
}
|
|
inline bool is_last(void)
|
|
{
|
|
return el == &list->last_ref()->next;
|
|
}
|
|
friend class error_list_iterator;
|
|
};
|
|
|
|
template <class T> class List :public base_list
|
|
{
|
|
public:
|
|
inline List() :base_list() {}
|
|
inline List(const List<T> &tmp) :base_list(tmp) {}
|
|
inline bool push_back(T *a) { return base_list::push_back(a); }
|
|
inline bool push_front(T *a) { return base_list::push_front(a); }
|
|
inline T* head() {return (T*) base_list::head(); }
|
|
inline T** head_ref() {return (T**) base_list::head_ref(); }
|
|
inline T* pop() {return (T*) base_list::pop(); }
|
|
void delete_elements(void)
|
|
{
|
|
list_node *element,*next;
|
|
for (element=first; element != &end_of_list; element=next)
|
|
{
|
|
next=element->next;
|
|
delete (T*) element->info;
|
|
}
|
|
empty();
|
|
}
|
|
};
|
|
|
|
|
|
template <class T> class List_iterator :public base_list_iterator
|
|
{
|
|
public:
|
|
List_iterator(List<T> &a) : base_list_iterator(a) {}
|
|
inline T* operator++(int) { return (T*) base_list_iterator::next(); }
|
|
inline T *replace(T *a) { return (T*) base_list_iterator::replace(a); }
|
|
inline T *replace(List<T> &a) { return (T*) base_list_iterator::replace(a); }
|
|
inline void after(T *a) { base_list_iterator::after(a); }
|
|
inline T** ref(void) { return (T**) base_list_iterator::ref(); }
|
|
};
|
|
|
|
template <class T> class List_iterator_fast :public base_list_iterator
|
|
{
|
|
protected:
|
|
inline T *replace(T *a) { return (T*) 0; }
|
|
inline T *replace(List<T> &a) { return (T*) 0; }
|
|
inline void remove(void) { }
|
|
inline void after(T *a) { }
|
|
inline T** ref(void) { return (T**) 0; }
|
|
|
|
public:
|
|
List_iterator_fast(List<T> &a) : base_list_iterator(a) {}
|
|
inline T* operator++(int) { return (T*) base_list_iterator::next_fast(); }
|
|
inline void rewind(void) { base_list_iterator::rewind(); }
|
|
void sublist(List<T> &list, uint el)
|
|
{
|
|
base_list_iterator::sublist(list, el);
|
|
}
|
|
};
|
|
|
|
|
|
/*
|
|
** A simple intrusive list which automaticly removes element from list
|
|
** on delete (for THD element)
|
|
*/
|
|
|
|
struct ilink {
|
|
struct ilink **prev,*next;
|
|
static void *operator new(size_t size)
|
|
{
|
|
return (void*)my_malloc((uint)size, MYF(MY_WME | MY_FAE));
|
|
}
|
|
static void operator delete(void* ptr_arg, size_t size)
|
|
{
|
|
my_free((gptr)ptr_arg, MYF(MY_WME|MY_ALLOW_ZERO_PTR));
|
|
}
|
|
|
|
inline ilink()
|
|
{
|
|
prev=0; next=0;
|
|
}
|
|
inline void unlink()
|
|
{
|
|
/* Extra tests because element doesn't have to be linked */
|
|
if (prev) *prev= next;
|
|
if (next) next->prev=prev;
|
|
prev=0 ; next=0;
|
|
}
|
|
virtual ~ilink() { unlink(); } /*lint -e1740 */
|
|
};
|
|
|
|
template <class T> class I_List_iterator;
|
|
|
|
class base_ilist {
|
|
public:
|
|
struct ilink *first,last;
|
|
inline void empty() { first= &last; last.prev= &first; }
|
|
base_ilist() { empty(); }
|
|
inline bool is_empty() { return first == &last; }
|
|
inline void append(ilink *a)
|
|
{
|
|
first->prev= &a->next;
|
|
a->next=first; a->prev= &first; first=a;
|
|
}
|
|
inline void push_back(ilink *a)
|
|
{
|
|
*last.prev= a;
|
|
a->next= &last;
|
|
a->prev= last.prev;
|
|
last.prev= &a->next;
|
|
}
|
|
inline struct ilink *get()
|
|
{
|
|
struct ilink *first_link=first;
|
|
if (first_link == &last)
|
|
return 0;
|
|
first_link->unlink(); // Unlink from list
|
|
return first_link;
|
|
}
|
|
friend class base_list_iterator;
|
|
};
|
|
|
|
|
|
class base_ilist_iterator
|
|
{
|
|
base_ilist *list;
|
|
struct ilink **el,*current;
|
|
public:
|
|
base_ilist_iterator(base_ilist &list_par) :list(&list_par),
|
|
el(&list_par.first),current(0) {}
|
|
void *next(void)
|
|
{
|
|
/* This is coded to allow push_back() while iterating */
|
|
current= *el;
|
|
if (current == &list->last) return 0;
|
|
el= ¤t->next;
|
|
return current;
|
|
}
|
|
};
|
|
|
|
|
|
template <class T>
|
|
class I_List :private base_ilist {
|
|
public:
|
|
I_List() :base_ilist() {}
|
|
inline void empty() { base_ilist::empty(); }
|
|
inline bool is_empty() { return base_ilist::is_empty(); }
|
|
inline void append(T* a) { base_ilist::append(a); }
|
|
inline void push_back(T* a) { base_ilist::push_back(a); }
|
|
inline T* get() { return (T*) base_ilist::get(); }
|
|
#ifndef _lint
|
|
friend class I_List_iterator<T>;
|
|
#endif
|
|
};
|
|
|
|
|
|
template <class T> class I_List_iterator :public base_ilist_iterator
|
|
{
|
|
public:
|
|
I_List_iterator(I_List<T> &a) : base_ilist_iterator(a) {}
|
|
inline T* operator++(int) { return (T*) base_ilist_iterator::next(); }
|
|
};
|