mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
72dec69046
Fixed bugfix of INSERT ... SET db_name.table_name.column_name Changed locking to external-locking Fix client hangup for some invalid SQL queries. Docs/manual.texi: Changelog & recent incompatible changes to 4.0.3 include/mysqld_error.h: New error messages myisam/ft_boolean_search.c: Removed compiler warning myisam/mi_check.c: Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff myisam/mi_dynrec.c: Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff myisam/mi_extra.c: Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff myisam/mi_key.c: Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff myisam/mi_open.c: Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff myisam/mi_packrec.c: Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff myisam/myisamdef.h: Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff myisam/sort.c: Fixed uninitialized variable mysql-test/r/insert_set.result: Change test case to use database foo mysql-test/r/union.result: Test wrong usage of union mysql-test/t/insert_set.test: Test bug in insert mysql-test/t/union.test: Test wrong usage of union sql/item.h: Indentation cleanup sql/item_cmpfunc.h: Indentation cleanup sql/item_func.h: Indentation cleanup sql/item_strfunc.h: Indentation cleanup sql/item_sum.h: Indentation cleanup sql/item_timefunc.h: Indentation cleanup sql/item_uniq.h: Indentation cleanup sql/mysql_priv.h: Fix that we always generate an error message when calling YYABORT sql/mysqld.cc: Changed command line arguments regarding locking to always use --external-locking Disable external locking by default sql/procedure.h: Cleanup sql/set_var.cc: change locking -> external_locking sql/share/czech/errmsg.txt: New error messages sql/share/danish/errmsg.txt: New error messages sql/share/dutch/errmsg.txt: New error messages sql/share/english/errmsg.txt: New error messages sql/share/estonian/errmsg.txt: New error messages sql/share/french/errmsg.txt: New error messages sql/share/german/errmsg.txt: New error messages sql/share/greek/errmsg.txt: New error messages sql/share/hungarian/errmsg.txt: New error messages sql/share/italian/errmsg.txt: New error messages sql/share/japanese/errmsg.txt: New error messages sql/share/korean/errmsg.txt: New error messages mysql-test/r/olap.result: Removed CUBE/ROLLUP mysql-test/t/olap.test: Removed CUBE/ROLLUP sql/share/norwegian-ny/errmsg.txt: New error messages sql/share/norwegian/errmsg.txt: New error messages sql/share/polish/errmsg.txt: New error messages sql/share/portuguese/errmsg.txt: New error messages sql/share/romanian/errmsg.txt: New error messages sql/share/russian/errmsg.txt: New error messages sql/share/slovak/errmsg.txt: New error messages sql/share/spanish/errmsg.txt: New error messages sql/share/swedish/errmsg.txt: New error messages sql/share/ukrainian/errmsg.txt: New error messages sql/sql_base.cc: Removed wrong patch for INSERT... sql/sql_insert.cc: Fix bug in INSERT ... SET db_name.table_name.column_name sql/sql_lex.h: Changed NON_EXISTIONG_ONE -> UNSPECIFIED_OLAP_TYPE sql/sql_olap.cc: Removed wrong implementation of CUBE/ROLLUP sql/sql_parse.cc: Removed wrong implementation of CUBE/ROLLUP Added function to give better error messages sql/sql_select.cc: Removed wrong implementation of CUBE/ROLLUP sql/sql_union.cc: Added comment sql/sql_yacc.yy: Fix that we always generate an error message when calling YYABORT
128 lines
4.3 KiB
C++
128 lines
4.3 KiB
C++
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult 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 */
|
|
|
|
|
|
/* When using sql procedures */
|
|
|
|
#ifdef __GNUC__
|
|
#pragma interface /* gcc class implementation */
|
|
#endif
|
|
|
|
#define PROC_NO_SORT 1 /* Bits in flags */
|
|
#define PROC_GROUP 2 /* proc must have group */
|
|
|
|
/* Procedure items used by procedures to store values for send_fields */
|
|
|
|
class Item_proc :public Item
|
|
{
|
|
public:
|
|
Item_proc(const char *name_par): Item()
|
|
{
|
|
this->name=(char*) name_par;
|
|
}
|
|
enum Type type() const { return Item::PROC_ITEM; }
|
|
virtual void set(double nr)=0;
|
|
virtual void set(const char *str,uint length)=0;
|
|
virtual void set(longlong nr)=0;
|
|
virtual enum_field_types field_type() const=0;
|
|
void set(const char *str) { set(str,(uint) strlen(str)); }
|
|
void make_field(Send_field *tmp_field)
|
|
{
|
|
init_make_field(tmp_field,field_type());
|
|
}
|
|
unsigned int size_of() { return sizeof(*this);}
|
|
};
|
|
|
|
class Item_proc_real :public Item_proc
|
|
{
|
|
double value;
|
|
public:
|
|
Item_proc_real(const char *name_par,uint dec) : Item_proc(name_par)
|
|
{
|
|
decimals=dec; max_length=float_length(dec);
|
|
}
|
|
enum Item_result result_type () const { return REAL_RESULT; }
|
|
enum_field_types field_type() const { return FIELD_TYPE_DOUBLE; }
|
|
void set(double nr) { value=nr; }
|
|
void set(longlong nr) { value=(double) nr; }
|
|
void set(const char *str,uint length __attribute__((unused)))
|
|
{ value=atof(str); }
|
|
double val() { return value; }
|
|
longlong val_int() { return (longlong) value; }
|
|
String *val_str(String *s) { s->set(value,decimals); return s; }
|
|
unsigned int size_of() { return sizeof(*this);}
|
|
};
|
|
|
|
class Item_proc_int :public Item_proc
|
|
{
|
|
longlong value;
|
|
public:
|
|
Item_proc_int(const char *name_par) :Item_proc(name_par)
|
|
{ max_length=11; }
|
|
enum Item_result result_type () const { return INT_RESULT; }
|
|
enum_field_types field_type() const { return FIELD_TYPE_LONG; }
|
|
void set(double nr) { value=(longlong) nr; }
|
|
void set(longlong nr) { value=nr; }
|
|
void set(const char *str,uint length __attribute__((unused)))
|
|
{ value=strtoll(str,NULL,10); }
|
|
double val() { return (double) value; }
|
|
longlong val_int() { return value; }
|
|
String *val_str(String *s) { s->set(value); return s; }
|
|
unsigned int size_of() { return sizeof(*this);}
|
|
};
|
|
|
|
|
|
class Item_proc_string :public Item_proc
|
|
{
|
|
public:
|
|
Item_proc_string(const char *name_par,uint length) :Item_proc(name_par)
|
|
{ this->max_length=length; }
|
|
enum Item_result result_type () const { return STRING_RESULT; }
|
|
enum_field_types field_type() const { return FIELD_TYPE_STRING; }
|
|
void set(double nr) { str_value.set(nr); }
|
|
void set(longlong nr) { str_value.set(nr); }
|
|
void set(const char *str, uint length) { str_value.copy(str,length); }
|
|
double val() { return atof(str_value.ptr()); }
|
|
longlong val_int() { return strtoll(str_value.ptr(),NULL,10); }
|
|
String *val_str(String*)
|
|
{
|
|
return null_value ? (String*) 0 : (String*) &str_value;
|
|
}
|
|
unsigned int size_of() { return sizeof(*this);}
|
|
};
|
|
|
|
/* The procedure class definitions */
|
|
|
|
class Procedure {
|
|
protected:
|
|
List<Item> *fields;
|
|
select_result *result;
|
|
public:
|
|
const uint flags;
|
|
ORDER *group,*param_fields;
|
|
Procedure(select_result *res,uint flags_par) :result(res),flags(flags_par),
|
|
group(0),param_fields(0) {}
|
|
virtual ~Procedure() {group=param_fields=0; fields=0; }
|
|
virtual void add(void)=0;
|
|
virtual void end_group(void)=0;
|
|
virtual int send_row(List<Item> &fields)=0;
|
|
virtual bool change_columns(List<Item> &fields)=0;
|
|
virtual void update_refs(void) {}
|
|
virtual bool end_of_records() { return 0; }
|
|
};
|
|
|
|
Procedure *setup_procedure(THD *thd,ORDER *proc_param,select_result *result,
|
|
List<Item> &field_list,int *error);
|