mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 19:41:47 +01:00
5a28c2caca
Warning handling and initial prepared statement handling (last not complete yet) Changed a lot of functions that returned 0/1 to my_bool type. GRANT handling now uses read/write locks instead of mutex Change basic net functions to use THD instead of NET (needed for 4.1 protocol) Use my_sprintf instead of sprintf() + strlen() Added alloc_query() to be able to chare query initialization code with prepared statements. Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID() Note that the following test fails (will be fixed ASAP): sub_select, union, rpl_rotate_logs and rpl_mystery22 BitKeeper/deleted/.del-README~3449730baf983117: Delete: mysql-test/t/README BitKeeper/deleted/.del-sql_error.cc~2f1caca8d2485dbe: Delete: libmysqld/sql_error.cc BitKeeper/deleted/.del-sql_prepare.cc~f703729793935ed6: Delete: libmysqld/sql_prepare.cc Docs/manual.texi: Updated variable list client/mysql.cc: Show warning count to user. client/mysqltest.c: Add warnings to test results configure.in: New shared library version number include/errmsg.h: Indentation cleanup include/mysql.h: Removed MYSQL_ERROR Indentaion cleanups include/mysql_com.h: Changed functions to returns true/false to my_bool. include/mysqld_error.h: New error messages isam/pack_isam.c: Indentation change libmysql/Makefile.am: Fix of wrong merge libmysql/Makefile.shared: Indentation cleanup libmysql/errmsg.c: Removed not used errors libmysql/libmysql.c: Change functions to return 1 on error (not -1) Change type of functions that returns 0/1 to my_bool Lot of code optimizations. Lot of changes for prepared statements. This now handles sending of binary data to server. Receving of binary data is not yet done (will have to wait until server code for this is ready) mysql_warning_count and mysql_warnings() implemented. libmysql/libmysql.def: Added mysql_warnings and mysql_warning_count libmysql/manager.c: Fixed wrong testing of result from my_connect() libmysqld/lib_sql.cc: Removed global variable THR_NET Change basic net functions to use THD instead of NET GRANT handling now uses read/write locks instead of mutex libmysqld/libmysqld.c: Changed functions to be my_bool myisam/ft_boolean_search.c: Trivial code cleanup myisam/ft_stopwords.c: Trivial code cleanup myisam/mi_check.c: Update to 4.1 structures myisam/myisampack.c: Trivial code cleanup myisam/rt_key.c: Code cleanup myisam/rt_test.c: Code cleanup Removed compiler warnings myisam/sp_key.c: Indentation changes myisam/sp_test.c: Removed compiler warnings mysql-test/README: Updated to reflect the new --external flag. mysql-test/mysql-test-run.sh: --local (start new server) is now default. Use --external to test against external server. mysql-test/r/rollback.result: Updated for 4.1 warnings mysql-test/r/rpl_log.result: Update for 4.1 mysql-test/t/rollback.test: Updated for 4.1 warnings mysql-test/t/rpl_log_pos.test: Portability fix mysys/hash.c: Indentation change mysys/my_error.c: Indentation change mysys/tree.c: Updated file description sql/field.cc: Fixed bugs introduced by merge Use my_sprintf instead of sprintf() + strlen() sql/field.h: Add CHARSET_INFO to field structure sql/gstream.h: Indentation changes. Added GPL copyright header sql/ha_innodb.cc: Updated parameters for net functions. sql/item.cc: Updates of Item_param Indentation changes sql/item.h: Removed size_of() function from item. sql/item_func.cc: Update function usage for 4.1 Added get_system_var() sql/item_func.h: Indentation change sql/item_strfunc.cc: Removed not needed inclusion of gstream.h Update to use system variables (from 4.0) sql/item_sum.h: Removed size_of() functions from item. sql/item_timefunc.cc: Change sprintf() + strlen() -> my_sprintf() Added length parameter to ->append() sql/item_timefunc.h: Removed size_of() functions from item. sql/item_uniq.h: Removed size_of() functions from item. sql/lex.h: Removed SQL_ERROR_COUNT variable sql/log.cc: Change sprintf() + strlen() -> my_sprintf() sql/log_event.cc: Change sprintf() + strlen() -> my_sprintf() sql/mini_client.cc: Added check that one always specifies a length to mc_mysql_query() sql/mysql_priv.h: New prototypes Change of NET -> THD parameter for net functions. sql/mysqld.cc: New startup options: 'max_prepared_statements', 'max_error_count' Updated usage of net functions. sql/net_pkg.cc: Change basic net functions to use THD instead of NET (needed to be able to handle 4.0 and 4.1 protocols) Lots of function comments sql/net_serv.cc: Change int return values -> my_bool Updated net_write_command() to take an extra header block to be added to the packet. (This made the prepared statement code much nicer and more efficient) sql/repl_failsafe.cc: Update net functions to use THD instead of NET sql/set_var.cc: Added @@error_count and @@warning_count variables. Updated to 4.1 function usage sql/set_var.h: Added @@error_count and @@warning_count variables. sql/share/czech/errmsg.txt: Removed Warning: from warning error messages. sql/share/english/errmsg.txt: Removed Warning: from warning error messages. sql/share/greek/errmsg.txt: Removed Warning: from warning error messages. sql/share/hungarian/errmsg.txt: Removed Warning: from warning error messages. sql/share/japanese/errmsg.txt: Removed Warning: from warning error messages. sql/share/korean/errmsg.txt: Removed Warning: from warning error messages. sql/share/norwegian-ny/errmsg.txt: Removed Warning: from warning error messages. sql/share/norwegian/errmsg.txt: Removed Warning: from warning error messages. sql/share/polish/errmsg.txt: Removed Warning: from warning error messages. sql/share/romanian/errmsg.txt: Removed Warning: from warning error messages. sql/share/slovak/errmsg.txt: Removed Warning: from warning error messages. sql/share/swedish/errmsg.txt: Removed Warning: from warning error messages. sql/slave.cc: Change basic net functions to use THD instead of NET skip_load_data_file recoded to fit new client/server protocol sql/spatial.h: Added copyright header Indentation cleanups sql/sql_acl.cc: Change basic net functions to use THD instead of NET GRANT handling now uses read/write locks instead of mutex sql/sql_analyse.cc: Change basic net functions to use THD instead of NET sprintf() + strlen() -> my_sprintf() sql/sql_base.cc: More DBUG statements sql/sql_class.cc: Change basic net functions to use THD instead of NET warning and prepared statement handling sql/sql_class.h: Change basic net functions to use THD instead of NET warning and prepared statement handling sql/sql_db.cc: Code cleanup & optimization. sql/sql_delete.cc: Change basic net functions to use THD instead of NET sql/sql_derived.cc: Change basic net functions to use THD instead of NET sql/sql_do.cc: Change basic net functions to use THD instead of NET sql/sql_error.cc: Big rewrite of error handling. sql/sql_handler.cc: Change basic net functions to use THD instead of NET sql/sql_insert.cc: Change basic net functions to use THD instead of NET sql/sql_lex.cc: Change basic net functions to use THD instead of NET sql/sql_lex.h: Added param_count to st_select_lex_node sql/sql_list.h: Removed not needed error list. sql/sql_load.cc: Change basic net functions to use THD instead of NET sql/sql_parse.cc: Change basic net functions to use THD instead of NET Added alloc_query() to be able to chare query initialization code with prepared statements. Update of warning handling. Added create_select_for_variable() (for SHOW COUNT(*) WARNINGS) sql/sql_prepare.cc: Initial prepared statement handling sql/sql_rename.cc: Change basic net functions to use THD instead of NET sql/sql_repl.cc: Change basic net functions to use THD instead of NET sql/sql_select.cc: Small code cleanups Added missing initialization of error that caused some queries that returned an empty result set to fail sql/sql_select.h: Ensure that JOIN.error is properly initialized sql/sql_show.cc: Change basic net functions to use THD instead of NET A lot of optimization sql/sql_table.cc: Change basic net functions to use THD instead of NET Indentaion cleanup sql/sql_udf.cc: Change basic net functions to use THD instead of NET sql/sql_union.cc: Change basic net functions to use THD instead of NET sql/sql_update.cc: Change basic net functions to use THD instead of NET sql/sql_yacc.yy: Change basic net functions to use THD instead of NET Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID() sql/structs.h: Moved structures to files where they was used sql/table.cc: Don't accept empty database names sql/uniques.cc: Indentation cleanup sql/unireg.cc: Change basic net functions to use THD instead of NET sql/unireg.h: Added defaults for warnings and prepared statements strings/ctype-simple.c: optimization tests/client_test.c: Fixed wrong paramaters to printf()
374 lines
10 KiB
C++
374 lines
10 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 */
|
|
|
|
|
|
/* classes to use when handling where clause */
|
|
|
|
#ifdef __GNUC__
|
|
#pragma interface /* gcc class implementation */
|
|
#endif
|
|
|
|
#include "procedure.h"
|
|
#include <myisam.h>
|
|
|
|
typedef struct keyuse_t {
|
|
TABLE *table;
|
|
Item *val; /* or value if no field */
|
|
uint key,keypart;
|
|
table_map used_tables;
|
|
} KEYUSE;
|
|
|
|
class store_key;
|
|
|
|
typedef struct st_table_ref
|
|
{
|
|
bool key_err;
|
|
uint key_parts; // num of ...
|
|
uint key_length; // length of key_buff
|
|
int key; // key no
|
|
byte *key_buff; // value to look for with key
|
|
byte *key_buff2; // key_buff+key_length
|
|
store_key **key_copy; //
|
|
Item **items; // val()'s for each keypart
|
|
table_map depend_map; // Table depends on these tables.
|
|
} TABLE_REF;
|
|
|
|
/*
|
|
** CACHE_FIELD and JOIN_CACHE is used on full join to cache records in outer
|
|
** table
|
|
*/
|
|
|
|
|
|
typedef struct st_cache_field {
|
|
char *str;
|
|
uint length,blob_length;
|
|
Field_blob *blob_field;
|
|
bool strip;
|
|
} CACHE_FIELD;
|
|
|
|
|
|
typedef struct st_join_cache {
|
|
uchar *buff,*pos,*end;
|
|
uint records,record_nr,ptr_record,fields,length,blobs;
|
|
CACHE_FIELD *field,**blob_ptr;
|
|
SQL_SELECT *select;
|
|
} JOIN_CACHE;
|
|
|
|
|
|
/*
|
|
** The structs which holds the join connections and join states
|
|
*/
|
|
|
|
enum join_type { JT_UNKNOWN,JT_SYSTEM,JT_CONST,JT_EQ_REF,JT_REF,JT_MAYBE_REF,
|
|
JT_ALL, JT_RANGE, JT_NEXT, JT_FT};
|
|
|
|
class JOIN;
|
|
|
|
typedef struct st_join_table {
|
|
TABLE *table;
|
|
KEYUSE *keyuse; /* pointer to first used key */
|
|
SQL_SELECT *select;
|
|
COND *select_cond;
|
|
QUICK_SELECT *quick;
|
|
Item *on_expr;
|
|
const char *info;
|
|
int (*read_first_record)(struct st_join_table *tab);
|
|
int (*next_select)(JOIN *,struct st_join_table *,bool);
|
|
READ_RECORD read_record;
|
|
double worst_seeks;
|
|
key_map const_keys; /* Keys with constant part */
|
|
key_map checked_keys; /* Keys checked in find_best */
|
|
key_map needed_reg;
|
|
ha_rows records,found_records,read_time;
|
|
table_map dependent,key_dependent;
|
|
uint keys; /* all keys with can be used */
|
|
uint use_quick,index;
|
|
uint status; // Save status for cache
|
|
uint used_fields,used_fieldlength,used_blobs;
|
|
enum join_type type;
|
|
bool cached_eq_ref_table,eq_ref_table,not_used_in_distinct;
|
|
TABLE_REF ref;
|
|
JOIN_CACHE cache;
|
|
JOIN *join;
|
|
} JOIN_TAB;
|
|
|
|
|
|
typedef struct st_position { /* Used in find_best */
|
|
double records_read;
|
|
JOIN_TAB *table;
|
|
KEYUSE *key;
|
|
} POSITION;
|
|
|
|
|
|
/* Param to create temporary tables when doing SELECT:s */
|
|
|
|
class TMP_TABLE_PARAM {
|
|
public:
|
|
List<Item> copy_funcs;
|
|
List_iterator_fast<Item> copy_funcs_it;
|
|
Copy_field *copy_field, *copy_field_end;
|
|
byte *group_buff;
|
|
Item_result_field **funcs;
|
|
MI_COLUMNDEF *recinfo,*start_recinfo;
|
|
KEY *keyinfo;
|
|
ha_rows end_write_records;
|
|
uint field_count,sum_func_count,func_count;
|
|
uint hidden_field_count;
|
|
uint group_parts,group_length,group_null_parts;
|
|
uint quick_group;
|
|
bool using_indirect_summary_function;
|
|
|
|
TMP_TABLE_PARAM()
|
|
:copy_funcs_it(copy_funcs), copy_field(0), group_parts(0),
|
|
group_length(0), group_null_parts(0)
|
|
{}
|
|
~TMP_TABLE_PARAM()
|
|
{
|
|
cleanup();
|
|
}
|
|
inline void cleanup(void)
|
|
{
|
|
if (copy_field) /* Fix for Intel compiler */
|
|
{
|
|
delete [] copy_field;
|
|
copy_field=0;
|
|
}
|
|
}
|
|
};
|
|
|
|
class JOIN :public Sql_alloc
|
|
{
|
|
public:
|
|
JOIN_TAB *join_tab,**best_ref,**map2table;
|
|
TABLE **table,**all_tables,*sort_by_table;
|
|
uint tables,const_tables;
|
|
uint send_group_parts;
|
|
bool sort_and_group,first_record,full_join,group, no_field_update;
|
|
bool do_send_rows;
|
|
table_map const_table_map,found_const_table_map,outer_join;
|
|
ha_rows send_records,found_records,examined_rows,row_limit;
|
|
POSITION positions[MAX_TABLES+1],best_positions[MAX_TABLES+1];
|
|
double best_read;
|
|
List<Item> *fields;
|
|
List<Item_buff> group_fields;
|
|
TABLE *tmp_table;
|
|
THD *thd;
|
|
Item_sum **sum_funcs;
|
|
Procedure *procedure;
|
|
Item *having;
|
|
uint select_options;
|
|
select_result *result;
|
|
TMP_TABLE_PARAM tmp_table_param;
|
|
MYSQL_LOCK *lock;
|
|
// unit structure (with global parameters) for this select
|
|
SELECT_LEX_UNIT *unit;
|
|
// select that processed
|
|
SELECT_LEX *select_lex;
|
|
|
|
bool select_distinct, //Is select distinct?
|
|
no_order, simple_order, simple_group,
|
|
skip_sort_order, need_tmp,
|
|
hidden_group_fields,
|
|
buffer_result;
|
|
DYNAMIC_ARRAY keyuse;
|
|
Item::cond_result cond_value;
|
|
List<Item> all_fields;
|
|
List<Item> & fields_list; // hold field list passed to mysql_select
|
|
int error;
|
|
|
|
ORDER *order, *group_list, *proc_param; //hold parameters of mysql_select
|
|
COND *conds; // ---"---
|
|
TABLE_LIST *tables_list; //hold 'tables' parameter of mysql_selec
|
|
SQL_SELECT *select; //created in optimisation phase
|
|
TABLE *exec_tmp_table; //used in 'exec' to hold temporary
|
|
|
|
my_bool test_function_query; // need to return select items 1 row
|
|
const char *zero_result_cause; // not 0 if exec must return zero result
|
|
|
|
my_bool union_part; // this subselect is part of union
|
|
|
|
JOIN(THD *thd, List<Item> &fields,
|
|
ulong select_options, select_result *result):
|
|
join_tab(0),
|
|
table(0),
|
|
tables(0), const_tables(0),
|
|
sort_and_group(0), first_record(0),
|
|
do_send_rows(1),
|
|
send_records(0), found_records(0), examined_rows(0),
|
|
thd(thd),
|
|
sum_funcs(0),
|
|
having(0),
|
|
select_options(select_options),
|
|
result(result),
|
|
lock(thd->lock),
|
|
select_lex(0), //for safety
|
|
select_distinct(test(select_options & SELECT_DISTINCT)),
|
|
no_order(0), simple_order(0), simple_group(0), skip_sort_order(0),
|
|
need_tmp(0),
|
|
hidden_group_fields (0), /*safety*/
|
|
buffer_result(test(select_options & OPTION_BUFFER_RESULT) &&
|
|
!test(select_options & OPTION_FOUND_ROWS)),
|
|
all_fields(fields),
|
|
fields_list(fields),
|
|
error(0),
|
|
select(0),
|
|
exec_tmp_table(0),
|
|
test_function_query(0),
|
|
zero_result_cause(0)
|
|
{
|
|
fields_list = fields;
|
|
bzero((char*) &keyuse,sizeof(keyuse));
|
|
tmp_table_param.copy_field=0;
|
|
tmp_table_param.end_write_records= HA_POS_ERROR;
|
|
}
|
|
|
|
int prepare(TABLE_LIST *tables,
|
|
COND *conds, ORDER *order, ORDER *group, Item *having,
|
|
ORDER *proc_param, SELECT_LEX *select, SELECT_LEX_UNIT *unit);
|
|
int optimize();
|
|
int global_optimize();
|
|
int reinit();
|
|
void exec();
|
|
int cleanup(THD *thd);
|
|
};
|
|
|
|
|
|
typedef struct st_select_check {
|
|
uint const_ref,reg_ref;
|
|
} SELECT_CHECK;
|
|
|
|
extern const char *join_type_str[];
|
|
void TEST_join(JOIN *join);
|
|
|
|
/* Extern functions in sql_select.cc */
|
|
bool store_val_in_field(Field *field,Item *val);
|
|
TABLE *create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
|
|
ORDER *group, bool distinct, bool save_sum_fields,
|
|
bool allow_distinct_limit, ulong select_options,
|
|
SELECT_LEX_UNIT *unit);
|
|
void free_tmp_table(THD *thd, TABLE *entry);
|
|
void count_field_types(TMP_TABLE_PARAM *param, List<Item> &fields,
|
|
bool reset_with_sum_func);
|
|
bool setup_copy_fields(THD *thd, TMP_TABLE_PARAM *param,List<Item> &fields);
|
|
void copy_fields(TMP_TABLE_PARAM *param);
|
|
void copy_funcs(Item_result_field **func_ptr);
|
|
bool create_myisam_from_heap(TABLE *table, TMP_TABLE_PARAM *param, int error,
|
|
bool ignore_last_dupp_error);
|
|
|
|
/* functions from opt_sum.cc */
|
|
int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds);
|
|
|
|
|
|
/* class to copying an field/item to a key struct */
|
|
|
|
class store_key :public Sql_alloc
|
|
{
|
|
protected:
|
|
Field *to_field; // Store data here
|
|
Field *key_field; // Copy of key field
|
|
char *null_ptr;
|
|
char err;
|
|
public:
|
|
store_key(THD *thd, Field *field_arg, char *ptr, char *null, uint length)
|
|
:null_ptr(null),err(0)
|
|
{
|
|
if (field_arg->type() == FIELD_TYPE_BLOB)
|
|
to_field=new Field_varstring(ptr, length, (uchar*) null, 1,
|
|
Field::NONE, field_arg->field_name,
|
|
field_arg->table, field_arg->binary(), default_charset_info);
|
|
else
|
|
{
|
|
to_field=field_arg->new_field(&thd->mem_root,field_arg->table);
|
|
if (to_field)
|
|
to_field->move_field(ptr, (uchar*) null, 1);
|
|
}
|
|
}
|
|
virtual ~store_key() {} /* Not actually needed */
|
|
virtual bool copy()=0;
|
|
virtual const char *name() const=0;
|
|
};
|
|
|
|
|
|
class store_key_field: public store_key
|
|
{
|
|
Copy_field copy_field;
|
|
const char *field_name;
|
|
public:
|
|
store_key_field(THD *thd, Field *to_field_arg, char *ptr, char *null_ptr_arg,
|
|
uint length, Field *from_field, const char *name_arg)
|
|
:store_key(thd, to_field_arg,ptr,
|
|
null_ptr_arg ? null_ptr_arg : from_field->maybe_null() ? &err
|
|
: NullS,length), field_name(name_arg)
|
|
{
|
|
if (to_field)
|
|
{
|
|
copy_field.set(to_field,from_field,0);
|
|
}
|
|
}
|
|
bool copy()
|
|
{
|
|
copy_field.do_copy(©_field);
|
|
return err != 0;
|
|
}
|
|
const char *name() const { return field_name; }
|
|
};
|
|
|
|
|
|
class store_key_item :public store_key
|
|
{
|
|
protected:
|
|
Item *item;
|
|
public:
|
|
store_key_item(THD *thd, Field *to_field_arg, char *ptr, char *null_ptr_arg,
|
|
uint length, Item *item_arg)
|
|
:store_key(thd, to_field_arg,ptr,
|
|
null_ptr_arg ? null_ptr_arg : item_arg->maybe_null ?
|
|
&err : NullS, length), item(item_arg)
|
|
{}
|
|
bool copy()
|
|
{
|
|
(void) item->save_in_field(to_field);
|
|
return err != 0;
|
|
}
|
|
const char *name() const { return "func"; }
|
|
};
|
|
|
|
|
|
class store_key_const_item :public store_key_item
|
|
{
|
|
bool inited;
|
|
public:
|
|
store_key_const_item(THD *thd, Field *to_field_arg, char *ptr,
|
|
char *null_ptr_arg, uint length,
|
|
Item *item_arg)
|
|
:store_key_item(thd, to_field_arg,ptr,
|
|
null_ptr_arg ? null_ptr_arg : item_arg->maybe_null ?
|
|
&err : NullS, length, item_arg), inited(0)
|
|
{
|
|
}
|
|
bool copy()
|
|
{
|
|
if (!inited)
|
|
{
|
|
inited=1;
|
|
(void)item->save_in_field(to_field);
|
|
}
|
|
return err != 0;
|
|
}
|
|
const char *name() const { return "const"; }
|
|
};
|
|
|
|
bool cp_buffer_from_ref(TABLE_REF *ref);
|