mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 23:04:20 +01:00
066c90563a
net_printf/send_error calls replaced by my_error family functions -1/1 (sent/unsent) error reporting removed (WL#2133) include/mysqld_error.h: new errors added. mysql-test/r/rpl_charset.result: new error mysql-test/r/rpl_timezone.result: new error mysql-test/r/sp-security.result: more clean error message mysql-test/r/sp.result: now error state intercepted correctly mysql-test/t/connect.test: new error message mysql-test/t/rpl_charset.test: new error message mysql-test/t/rpl_timezone.test: new error mysql-test/t/sp-security.test: more correct error handling mysql-test/t/sp.test: now error state intercepted correctly sql/ha_innodb.cc: -1/1 (sent/unsent) error reporting removed sql/ha_innodb.h: -1/1 (sent/unsent) error reporting removed sql/item.cc: only boolean values should be returned by fix_fields() sql/item_cmpfunc.cc: only boolean values should be returned by fix_fields() sql/item_func.cc: only boolean values should be returned by fix_fields() net_printf/send_error calls replaced by my_error family functions sql/item_row.cc: only boolean values should be returned by fix_fields() sql/item_subselect.cc: only boolean values should be returned by fix_fields() -1/1 (sent/unsent) error reporting removed sql/item_subselect.h: -1/1 (sent/unsent) error reporting removed sql/item_sum.cc: only boolean values should be returned by fix_fields() sql/item_timefunc.cc: only boolean values should be returned by fix_fields() sql/item_uniq.h: only boolean values should be returned by fix_fields() sql/mysql_priv.h: -1/1 (sent/unsent) error reporting removed sql/mysqld.cc: net_printf/send_error calls replaced by my_error family functions changes in my_message_sql to support error handling correctly sql/protocol.cc: net_printf/send_error calls replaced by my_error family functions sql/protocol_cursor.cc: net_printf/send_error calls replaced by my_error family functions sql/repl_failsafe.cc: net_printf/send_error calls replaced by my_error family functions -1/1 (sent/unsent) error reporting removed sql/repl_failsafe.h: -1/1 (sent/unsent) error reporting removed sql/set_var.cc: net_printf/send_error calls replaced by my_error family functions 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 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/serbian/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/slave.cc: net_printf/send_error calls replaced by my_error family functions -1/1 (sent/unsent) error reporting removed sql/slave.h: -1/1 (sent/unsent) error reporting removed sql/sp.cc: net_printf/send_error calls replaced by my_error family functions sql/sp_head.cc: new eror handling support net_printf/send_error calls replaced by my_error family functions sql/sp_rcontext.cc: net_printf/send_error calls replaced by my_error family functions sql/sql_acl.cc: net_printf/send_error calls replaced by my_error family functions -1/1 (sent/unsent) error reporting removed sql/sql_acl.h: -1/1 (sent/unsent) error reporting removed sql/sql_base.cc: -1/1 (sent/unsent) error reporting removed net_printf/send_error calls replaced by my_error family functions sql/sql_class.cc: net_printf/send_error calls replaced by my_error family functions sql/sql_class.h: my_messhage_sql now set/reset query_error flag sql/sql_db.cc: -1/1 (sent/unsent) error reporting removed sql/sql_delete.cc: -1/1 (sent/unsent) error reporting removed net_printf/send_error calls replaced by my_error family functions sql/sql_do.cc: -1/1 (sent/unsent) error reporting removed sql/sql_error.cc: -1/1 (sent/unsent) error reporting removed sql/sql_handler.cc: -1/1 (sent/unsent) error reporting removed net_printf/send_error calls replaced by my_error family functions sql/sql_help.cc: net_printf/send_error calls replaced by my_error family functions -1/1 (sent/unsent) error reporting removed sql/sql_insert.cc: -1/1 (sent/unsent) error reporting removed net_printf/send_error calls replaced by my_error family functions sql/sql_lex.h: -1/1 (sent/unsent) error reporting removed sql/sql_load.cc: -1/1 (sent/unsent) error reporting removed sql/sql_map.cc: errors without code removed sql/sql_parse.cc: net_printf/send_error calls replaced by my_error family functions -1/1 (sent/unsent) error reporting removed from mysql_execute_command sql/sql_prepare.cc: net_printf/send_error calls replaced by my_error family functions -1/1 (sent/unsent) error reporting removed sql/sql_repl.cc: error messages fixed net_printf/send_error calls replaced by my_error family functions -1/1 (sent/unsent) error reporting removed sql/sql_repl.h: -1/1 (sent/unsent) error reporting removed sql/sql_select.cc: -1/1 (sent/unsent) error reporting removed sql/sql_select.h: -1/1 (sent/unsent) error reporting removed sql/sql_show.cc: -1/1 (sent/unsent) error reporting removed net_printf/send_error calls replaced by my_error family functions sql/sql_table.cc: net_printf/send_error calls replaced by my_error family functions -1/1 (sent/unsent) error reporting removed sql/sql_trigger.cc: -1/1 (sent/unsent) error reporting removed sql/sql_udf.cc: net_printf/send_error calls replaced by my_error family functions sql/sql_union.cc: -1/1 (sent/unsent) error reporting removed sql/sql_update.cc: -1/1 (sent/unsent) error reporting removed net_printf/send_error calls replaced by my_error family functions sql/sql_view.cc: -1/1 (sent/unsent) error reporting removed sql/sql_view.h: -1/1 (sent/unsent) error reporting removed sql/sql_yacc.yy: net_printf/send_error calls replaced by my_error family functions
146 lines
4.4 KiB
C++
146 lines
4.4 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 */
|
|
|
|
/*
|
|
Low level functions for storing data to be send to the MySQL client
|
|
The actual communction is handled by the net_xxx functions in net_serv.cc
|
|
*/
|
|
|
|
#ifdef __GNUC__
|
|
#pragma implementation // gcc: Class implementation
|
|
#endif
|
|
|
|
#include "mysql_priv.h"
|
|
#include <mysql.h>
|
|
|
|
bool Protocol_cursor::send_fields(List<Item> *list, int flags)
|
|
{
|
|
List_iterator_fast<Item> it(*list);
|
|
Item *item;
|
|
MYSQL_FIELD *client_field;
|
|
|
|
DBUG_ENTER("send_fields");
|
|
if (prepare_for_send(list))
|
|
return FALSE;
|
|
|
|
fields= (MYSQL_FIELD *)alloc_root(alloc, sizeof(MYSQL_FIELD) * field_count);
|
|
if (!fields)
|
|
goto err;
|
|
|
|
client_field= fields;
|
|
while ((item= it++))
|
|
{
|
|
Send_field server_field;
|
|
item->make_field(&server_field);
|
|
|
|
client_field->db= strdup_root(alloc, server_field.db_name);
|
|
client_field->table= strdup_root(alloc, server_field.table_name);
|
|
client_field->name= strdup_root(alloc, server_field.col_name);
|
|
client_field->org_table= strdup_root(alloc, server_field.org_table_name);
|
|
client_field->org_name= strdup_root(alloc, server_field.org_col_name);
|
|
client_field->catalog= strdup_root(alloc, "");
|
|
client_field->length= server_field.length;
|
|
client_field->type= server_field.type;
|
|
client_field->flags= server_field.flags;
|
|
client_field->decimals= server_field.decimals;
|
|
client_field->db_length= strlen(client_field->db);
|
|
client_field->table_length= strlen(client_field->table);
|
|
client_field->name_length= strlen(client_field->name);
|
|
client_field->org_name_length= strlen(client_field->org_name);
|
|
client_field->org_table_length= strlen(client_field->org_table);
|
|
client_field->catalog_length= 0;
|
|
client_field->charsetnr= server_field.charsetnr;
|
|
|
|
if (INTERNAL_NUM_FIELD(client_field))
|
|
client_field->flags|= NUM_FLAG;
|
|
|
|
if (flags & (int) Protocol::SEND_DEFAULTS)
|
|
{
|
|
char buff[80];
|
|
String tmp(buff, sizeof(buff), default_charset_info), *res;
|
|
|
|
if (!(res=item->val_str(&tmp)))
|
|
client_field->def= (char*) "";
|
|
else
|
|
client_field->def= strmake_root(alloc, res->ptr(), res->length());
|
|
}
|
|
else
|
|
client_field->def=0;
|
|
client_field->max_length= 0;
|
|
++client_field;
|
|
}
|
|
|
|
DBUG_RETURN(FALSE);
|
|
err:
|
|
my_error(ER_OUT_OF_RESOURCES, MYF(0)); /* purecov: inspected */
|
|
DBUG_RETURN(TRUE); /* purecov: inspected */
|
|
}
|
|
|
|
/* Get the length of next field. Change parameter to point at fieldstart */
|
|
bool Protocol_cursor::write()
|
|
{
|
|
byte *cp= (byte *)packet->ptr();
|
|
byte *end_pos= (byte *)packet->ptr() + packet->length();
|
|
ulong len;
|
|
MYSQL_FIELD *cur_field= fields;
|
|
MYSQL_FIELD *fields_end= fields + field_count;
|
|
MYSQL_ROWS *new_record;
|
|
byte **data_tmp;
|
|
byte *to;
|
|
|
|
new_record= (MYSQL_ROWS *)alloc_root(alloc,
|
|
sizeof(MYSQL_ROWS) + (field_count + 1)*sizeof(char *) + packet->length());
|
|
if (!new_record)
|
|
goto err;
|
|
data_tmp= (byte **)(new_record + 1);
|
|
new_record->data= (char **)data_tmp;
|
|
|
|
to= (byte *)data_tmp + (field_count + 1)*sizeof(char *);
|
|
|
|
for (; cur_field < fields_end; ++cur_field, ++data_tmp)
|
|
{
|
|
if ((len= net_field_length((uchar **)&cp)) == 0 ||
|
|
len == NULL_LENGTH)
|
|
{
|
|
*data_tmp= 0;
|
|
}
|
|
else
|
|
{
|
|
if ((long)len > (end_pos - cp))
|
|
{
|
|
// TODO error signal send_error(thd, CR_MALFORMED_PACKET);
|
|
return TRUE;
|
|
}
|
|
*data_tmp= to;
|
|
memcpy(to,(char*) cp,len);
|
|
to[len]=0;
|
|
to+=len+1;
|
|
cp+=len;
|
|
if (cur_field->max_length < len)
|
|
cur_field->max_length=len;
|
|
}
|
|
}
|
|
*data_tmp= 0;
|
|
|
|
*prev_record= new_record;
|
|
prev_record= &new_record->next;
|
|
new_record->next= NULL;
|
|
row_count++;
|
|
return FALSE;
|
|
err:
|
|
// TODO error signal send_error(thd, ER_OUT_OF_RESOURCES);
|
|
return TRUE;
|
|
}
|