mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
35da5e43fb
Fixed compiler warnings (IRIX C compiler and VC++) VC++Files/client/mysqlclient.dsp: Add missing file to project VC++Files/libmysql/libmysql.dsp: Add missing file to project VC++Files/myisam/myisam.dsp: Add missing file to project VC++Files/mysys/mysys.dsp: Add missing file to project heap/hp_test1.c: Fixed wrong call to heap_rkey() heap/hp_test2.c: Fixed wrong call to heap_rkey() include/hash.h: Move not used (internal) struct to hash.c include/my_pthread.h: Made some structs 'const char*' to avoid warnings include/my_sys.h: Moved key cache structs and functions to keycache.h include/myisam.h: Merge key cache structures to one include/mysql.h: Remove STDCALL from internal functions include/sql_common.h: Remove STDCALL from internal functions include/violite.h: Fixed compiler warning isam/_locking.c: Merge key cache structures to one isam/_page.c: Merge key cache structures to one isam/close.c: Merge key cache structures to one isam/extra.c: Merge key cache structures to one isam/isamchk.c: Merge key cache structures to one isam/isamdef.h: Merge key cache structures to one isam/isamlog.c: Merge key cache structures to one isam/panic.c: Merge key cache structures to one isam/test2.c: Merge key cache structures to one isam/test3.c: Merge key cache structures to one libmysql/client_settings.h: Remove STDCALL from internal functions libmysql/libmysql.c: Remove STDCALL from internal functions myisam/ft_boolean_search.c: Fixed compiler warning myisam/ft_dump.c: Fixed compiler warnings (%qx is not portable) myisam/ft_update.c: Fixed compiler warnings myisam/mi_check.c: Merge key cache structures to one myisam/mi_close.c: Merge key cache structures to one myisam/mi_delete_all.c: Merge key cache structures to one myisam/mi_extra.c: Merge key cache structures to one myisam/mi_keycache.c: Merge key cache structures to one myisam/mi_locking.c: Merge key cache structures to one myisam/mi_page.c: Merge key cache structures to one myisam/mi_panic.c: Merge key cache structures to one myisam/mi_preload.c: Merge key cache structures to one myisam/mi_test1.c: Merge key cache structures to one myisam/mi_test2.c: Merge key cache structures to one myisam/mi_test3.c: Merge key cache structures to one myisam/myisamchk.c: Merge key cache structures to one myisam/myisamdef.h: Merge key cache structures to one myisam/myisamlog.c: Merge key cache structures to one Removed not used option myisam/sort.c: Fixed compiler warnings myisam/sp_test.c: Fixed compiler warnings mysql-test/r/case.result: Updated results after fix of correct NULL detection in WHEN mysql-test/r/date_formats.result: Updated results after fixing date handling mysql-test/r/symlink.result: Updated results after adding DEFAULT CHARSET mysql-test/t/case.test: New test mysql-test/t/symlink.test: Updated error numbers mysys/hash.c: Made HASH_LINK struct local mysys/mf_keycache.c: Merge key cache structures to one Fixed key_cache_read() and key_cache_write() to be resize-safe. mysys/mf_keycaches.c: Merge key cache structures to one mysys/thr_mutex.c: Added test if mutex is initalized sql-common/client.c: Remove STDCALL from internal functions sql/derror.cc: Added comment sql/field.cc: Removed not used variables sql/ha_innodb.cc: Fixed compiler warnings (removed not used variables) sql/ha_myisam.cc: Merge key cache structures to one sql/ha_myisammrg.cc: Removed not used variables sql/handler.cc: Merge key cache structures to one sql/handler.h: Merge key cache structures to one sql/item.cc: Fixed compiler warning sql/item_cmpfunc.cc: Remove not used variables sql/item_func.cc: Remove not used variables sql/item_strfunc.cc: Removed not used variables sql/item_sum.cc: Removed not used variables Moved setting of item_thd to fix_fields() sql/item_timefunc.cc: Removed not used variables sql/mysql_priv.h: Merge key cache structures to one sql/mysqld.cc: Merge key cache structures to one init_thread_environment() is not called before mysql_init_variables(). This fixes a case where a mutex was not initialized before it was used sql/opt_sum.cc: Remove not used variables sql/protocol.cc: Don't send errors after ok has been sent sql/protocol_cursor.cc: Remove not used variable Simple optimization sql/repl_failsafe.cc: Remove not used variables sql/set_var.cc: Merge key cache structures to one sql/set_var.h: Merge key cache structures to one sql/sql_acl.cc: Remove not used variables sql/sql_base.cc: Remove not used function sql/sql_db.cc: Remove not used variables sql/sql_handler.cc: Remove not used variables sql/sql_insert.cc: More DBUG statements Simple code cleanup sql/sql_lex.cc: Remove not used variables sql/sql_parse.cc: Remove not used variables sql/sql_prepare.cc: Remove not used variables sql/sql_repl.cc: Remove not used variables sql/sql_select.cc: Remove not used variables sql/sql_show.cc: Remove not used variables sql/sql_table.cc: Merge key cache structures to one Removed not used variables sql/sql_test.cc: Merge key cache structures to one sql/strfunc.cc: Fixed that find_type() returns correct value for partly matched words. (This fixed the error found by date_formats.test) sql/time.cc: Remove not used variables strings/my_strtoll10.c: Fixed compiler warnings
143 lines
4.2 KiB
C++
143 lines
4.2 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, uint flag)
|
|
{
|
|
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->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->charsetnr= server_field.charsetnr;
|
|
|
|
if (INTERNAL_NUM_FIELD(client_field))
|
|
client_field->flags|= NUM_FLAG;
|
|
|
|
if (flag & 2)
|
|
{
|
|
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:
|
|
send_error(thd, ER_OUT_OF_RESOURCES); /* 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;
|
|
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= (byte **)(new_record + 1);
|
|
new_record->data= (char **)data;
|
|
|
|
to= (byte *)(fields + field_count + 1);
|
|
|
|
for (; cur_field < fields_end; ++cur_field, ++data)
|
|
{
|
|
if ((len=net_field_length((uchar **)&cp)))
|
|
{
|
|
*data= 0;
|
|
}
|
|
else
|
|
{
|
|
if ((long)len > (end_pos - cp))
|
|
{
|
|
// TODO error signal send_error(thd, CR_MALFORMED_PACKET);
|
|
return TRUE;
|
|
}
|
|
memcpy(to,(char*) cp,len);
|
|
to[len]=0;
|
|
to+=len+1;
|
|
cp+=len;
|
|
if (cur_field->max_length < len)
|
|
cur_field->max_length=len;
|
|
}
|
|
}
|
|
|
|
*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;
|
|
}
|
|
|
|
|