2001-04-11 13:04:03 +02:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2000
|
|
|
|
* SWsoft company
|
|
|
|
*
|
|
|
|
* This material is provided "as is", with absolutely no warranty expressed
|
|
|
|
* or implied. Any use is at your own risk.
|
|
|
|
*
|
|
|
|
* Permission to use or copy this software for any purpose is hereby granted
|
|
|
|
* without fee, provided the above notices are retained on all copies.
|
|
|
|
* Permission to modify the code and to distribute modified code is granted,
|
|
|
|
* provided the above notices are retained, and a notice that the code was
|
|
|
|
* modified is included with the above copyright notice.
|
|
|
|
*
|
2002-07-23 17:31:22 +02:00
|
|
|
|
|
|
|
This code was modified by the MySQL team
|
|
|
|
*/
|
2001-04-11 13:04:03 +02:00
|
|
|
|
2001-09-30 04:47:34 +02:00
|
|
|
/*
|
|
|
|
The following is needed to not cause conflicts when we include mysqld.cc
|
|
|
|
*/
|
|
|
|
|
2001-04-11 13:04:03 +02:00
|
|
|
#define main main1
|
|
|
|
#define mysql_unix_port mysql_inix_port1
|
|
|
|
#define mysql_port mysql_port1
|
|
|
|
|
2004-05-26 18:40:27 +02:00
|
|
|
extern "C"
|
|
|
|
{
|
2004-05-27 01:50:42 +02:00
|
|
|
extern unsigned long max_allowed_packet, net_buffer_length;
|
2004-05-26 18:40:27 +02:00
|
|
|
}
|
|
|
|
|
2001-06-05 00:34:04 +02:00
|
|
|
#include "../sql/mysqld.cc"
|
2001-04-11 13:04:03 +02:00
|
|
|
|
2001-10-02 04:53:00 +02:00
|
|
|
C_MODE_START
|
2006-03-06 22:08:29 +01:00
|
|
|
|
2002-12-16 14:33:29 +01:00
|
|
|
#include <mysql.h>
|
2003-09-08 15:49:23 +02:00
|
|
|
#undef ER
|
2002-10-13 11:23:55 +02:00
|
|
|
#include "errmsg.h"
|
2003-07-18 13:26:35 +02:00
|
|
|
#include <sql_common.h>
|
2006-01-04 11:20:28 +01:00
|
|
|
#include "embedded_priv.h"
|
2001-10-02 04:53:00 +02:00
|
|
|
|
2006-01-04 11:20:28 +01:00
|
|
|
static my_bool emb_read_query_result(MYSQL *mysql);
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Reads error information from the MYSQL_DATA and puts
|
|
|
|
it into proper MYSQL members
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
embedded_get_error()
|
|
|
|
mysql connection handler
|
|
|
|
data query result
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
after that function error information will be accessible
|
|
|
|
with usual functions like mysql_error()
|
|
|
|
data is my_free-d in this function
|
|
|
|
most of the data is stored in data->embedded_info structure
|
|
|
|
*/
|
|
|
|
|
|
|
|
void embedded_get_error(MYSQL *mysql, MYSQL_DATA *data)
|
|
|
|
{
|
|
|
|
NET *net= &mysql->net;
|
|
|
|
struct embedded_query_result *ei= data->embedded_info;
|
2008-02-28 18:55:46 +01:00
|
|
|
net->last_errno= ei->last_errno;
|
|
|
|
strmake(net->last_error, ei->info, sizeof(net->last_error)-1);
|
2006-01-04 11:20:28 +01:00
|
|
|
memcpy(net->sqlstate, ei->sqlstate, sizeof(net->sqlstate));
|
2007-11-29 07:37:07 +01:00
|
|
|
mysql->server_status= ei->server_status;
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
my_free(data, MYF(0));
|
2004-05-17 09:05:57 +02:00
|
|
|
}
|
|
|
|
|
2003-12-08 11:25:37 +01:00
|
|
|
static my_bool
|
2003-06-17 18:32:31 +02:00
|
|
|
emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
const uchar *header, ulong header_length,
|
|
|
|
const uchar *arg, ulong arg_length, my_bool skip_check,
|
2006-06-01 14:06:42 +02:00
|
|
|
MYSQL_STMT *stmt)
|
2001-04-11 13:04:03 +02:00
|
|
|
{
|
2002-10-13 11:23:55 +02:00
|
|
|
my_bool result= 1;
|
2002-12-16 14:33:29 +01:00
|
|
|
THD *thd=(THD *) mysql->thd;
|
2003-09-08 15:49:23 +02:00
|
|
|
NET *net= &mysql->net;
|
2002-10-13 11:23:55 +02:00
|
|
|
|
2007-12-14 15:39:57 +01:00
|
|
|
#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER)
|
|
|
|
thd->profiling.start_new_query();
|
|
|
|
#endif
|
|
|
|
|
2006-01-04 11:20:28 +01:00
|
|
|
thd->clear_data_list();
|
2002-10-13 11:23:55 +02:00
|
|
|
/* Check that we are calling the client functions in right order */
|
|
|
|
if (mysql->status != MYSQL_STATUS_READY)
|
|
|
|
{
|
2007-10-31 15:16:53 +01:00
|
|
|
set_mysql_error(mysql, CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate);
|
2002-10-13 11:23:55 +02:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Clear result variables */
|
2003-02-10 16:59:16 +01:00
|
|
|
thd->clear_error();
|
2007-12-13 21:58:55 +01:00
|
|
|
thd->main_da.reset_diagnostics_area();
|
2002-10-13 11:23:55 +02:00
|
|
|
mysql->affected_rows= ~(my_ulonglong) 0;
|
2003-07-18 13:26:35 +02:00
|
|
|
mysql->field_count= 0;
|
2007-10-31 15:16:53 +01:00
|
|
|
net_clear_error(net);
|
2006-10-24 14:19:02 +02:00
|
|
|
thd->current_stmt= stmt;
|
2002-10-13 11:23:55 +02:00
|
|
|
|
2001-06-15 21:55:15 +02:00
|
|
|
thd->store_globals(); // Fix if more than one connect
|
2007-11-11 20:38:28 +01:00
|
|
|
lex_start(thd);
|
2003-09-10 09:58:26 +02:00
|
|
|
/*
|
|
|
|
We have to call free_old_query before we start to fill mysql->fields
|
|
|
|
for new query. In the case of embedded server we collect field data
|
|
|
|
during query execution (not during data retrieval as it is in remote
|
|
|
|
client). So we have to call free_old_query here
|
|
|
|
*/
|
2003-07-18 13:26:35 +02:00
|
|
|
free_old_query(mysql);
|
2003-10-06 13:32:38 +02:00
|
|
|
|
|
|
|
thd->extra_length= arg_length;
|
|
|
|
thd->extra_data= (char *)arg;
|
|
|
|
if (header)
|
2003-09-18 09:25:00 +02:00
|
|
|
{
|
|
|
|
arg= header;
|
|
|
|
arg_length= header_length;
|
|
|
|
}
|
|
|
|
|
2007-10-10 02:12:13 +02:00
|
|
|
result= dispatch_command(command, thd, (char *) arg, arg_length);
|
2006-01-04 11:20:28 +01:00
|
|
|
thd->cur_data= 0;
|
2001-12-06 13:10:51 +01:00
|
|
|
|
2003-06-17 18:32:31 +02:00
|
|
|
if (!skip_check)
|
2007-12-12 16:21:01 +01:00
|
|
|
result= thd->is_error() ? -1 : 0;
|
2001-04-11 13:04:03 +02:00
|
|
|
|
2007-12-14 15:39:57 +01:00
|
|
|
#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER)
|
|
|
|
thd->profiling.finish_current_query();
|
|
|
|
#endif
|
2002-10-13 11:23:55 +02:00
|
|
|
return result;
|
2001-04-11 13:04:03 +02:00
|
|
|
}
|
|
|
|
|
2004-07-22 17:54:25 +02:00
|
|
|
static void emb_flush_use_result(MYSQL *mysql)
|
|
|
|
{
|
2006-01-04 11:20:28 +01:00
|
|
|
THD *thd= (THD*) mysql->thd;
|
|
|
|
if (thd->cur_data)
|
2004-07-22 17:54:25 +02:00
|
|
|
{
|
2006-01-04 11:20:28 +01:00
|
|
|
free_rows(thd->cur_data);
|
|
|
|
thd->cur_data= 0;
|
|
|
|
}
|
|
|
|
else if (thd->first_data)
|
|
|
|
{
|
|
|
|
MYSQL_DATA *data= thd->first_data;
|
|
|
|
thd->first_data= data->embedded_info->next;
|
2004-07-22 17:54:25 +02:00
|
|
|
free_rows(data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-01-04 11:20:28 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
reads dataset from the next query result
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
emb_read_rows()
|
|
|
|
mysql connection handle
|
|
|
|
other parameters are not used
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
It just gets next MYSQL_DATA from the result's queue
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
pointer to MYSQL_DATA with the coming recordset
|
|
|
|
*/
|
|
|
|
|
2003-12-08 11:25:37 +01:00
|
|
|
static MYSQL_DATA *
|
2003-09-16 13:06:25 +02:00
|
|
|
emb_read_rows(MYSQL *mysql, MYSQL_FIELD *mysql_fields __attribute__((unused)),
|
2003-09-18 15:58:02 +02:00
|
|
|
unsigned int fields __attribute__((unused)))
|
2003-09-16 13:06:25 +02:00
|
|
|
{
|
2006-01-04 11:20:28 +01:00
|
|
|
MYSQL_DATA *result= ((THD*)mysql->thd)->cur_data;
|
|
|
|
((THD*)mysql->thd)->cur_data= 0;
|
|
|
|
if (result->embedded_info->last_errno)
|
2003-09-17 12:18:18 +02:00
|
|
|
{
|
2006-01-04 11:20:28 +01:00
|
|
|
embedded_get_error(mysql, result);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
*result->embedded_info->prev_ptr= NULL;
|
2003-09-16 13:06:25 +02:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2006-01-04 11:20:28 +01:00
|
|
|
|
2003-12-08 11:25:37 +01:00
|
|
|
static MYSQL_FIELD *emb_list_fields(MYSQL *mysql)
|
2003-09-16 13:06:25 +02:00
|
|
|
{
|
2006-01-04 11:20:28 +01:00
|
|
|
MYSQL_DATA *res;
|
|
|
|
if (emb_read_query_result(mysql))
|
|
|
|
return 0;
|
|
|
|
res= ((THD*) mysql->thd)->cur_data;
|
|
|
|
((THD*) mysql->thd)->cur_data= 0;
|
|
|
|
mysql->field_alloc= res->alloc;
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
my_free(res,MYF(0));
|
2006-01-04 11:20:28 +01:00
|
|
|
mysql->status= MYSQL_STATUS_READY;
|
2003-09-16 13:06:25 +02:00
|
|
|
return mysql->fields;
|
|
|
|
}
|
|
|
|
|
2003-12-08 11:25:37 +01:00
|
|
|
static my_bool emb_read_prepare_result(MYSQL *mysql, MYSQL_STMT *stmt)
|
2003-09-16 13:06:25 +02:00
|
|
|
{
|
2006-01-04 11:20:28 +01:00
|
|
|
THD *thd= (THD*) mysql->thd;
|
|
|
|
MYSQL_DATA *res;
|
|
|
|
|
2003-09-16 13:06:25 +02:00
|
|
|
stmt->stmt_id= thd->client_stmt_id;
|
|
|
|
stmt->param_count= thd->client_param_count;
|
2006-01-04 11:20:28 +01:00
|
|
|
stmt->field_count= 0;
|
2007-01-02 23:41:14 +01:00
|
|
|
mysql->warning_count= thd->total_warn_count;
|
2003-09-16 13:06:25 +02:00
|
|
|
|
2006-01-04 11:20:28 +01:00
|
|
|
if (thd->first_data)
|
2003-09-16 13:06:25 +02:00
|
|
|
{
|
2006-01-04 11:20:28 +01:00
|
|
|
if (emb_read_query_result(mysql))
|
|
|
|
return 1;
|
|
|
|
stmt->field_count= mysql->field_count;
|
|
|
|
mysql->status= MYSQL_STATUS_READY;
|
|
|
|
res= thd->cur_data;
|
|
|
|
thd->cur_data= NULL;
|
2003-09-16 13:06:25 +02:00
|
|
|
if (!(mysql->server_status & SERVER_STATUS_AUTOCOMMIT))
|
|
|
|
mysql->server_status|= SERVER_STATUS_IN_TRANS;
|
|
|
|
|
|
|
|
stmt->fields= mysql->fields;
|
2006-01-04 11:20:28 +01:00
|
|
|
stmt->mem_root= res->alloc;
|
2003-09-18 09:25:00 +02:00
|
|
|
mysql->fields= NULL;
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
my_free(res,MYF(0));
|
2003-09-16 13:06:25 +02:00
|
|
|
}
|
2003-09-17 12:18:18 +02:00
|
|
|
|
2003-09-16 13:06:25 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**************************************************************************
|
|
|
|
Get column lengths of the current row
|
|
|
|
If one uses mysql_use_result, res->lengths contains the length information,
|
|
|
|
else the lengths are calculated from the offset between pointers.
|
|
|
|
**************************************************************************/
|
|
|
|
|
2003-12-08 11:25:37 +01:00
|
|
|
static void emb_fetch_lengths(ulong *to, MYSQL_ROW column,
|
|
|
|
unsigned int field_count)
|
2003-09-16 13:06:25 +02:00
|
|
|
{
|
|
|
|
MYSQL_ROW end;
|
|
|
|
|
|
|
|
for (end=column + field_count; column != end ; column++,to++)
|
|
|
|
*to= *column ? *(uint *)((*column) - sizeof(uint)) : 0;
|
|
|
|
}
|
|
|
|
|
2006-01-04 11:20:28 +01:00
|
|
|
static my_bool emb_read_query_result(MYSQL *mysql)
|
2003-09-16 13:06:25 +02:00
|
|
|
{
|
2006-01-04 11:20:28 +01:00
|
|
|
THD *thd= (THD*) mysql->thd;
|
|
|
|
MYSQL_DATA *res= thd->first_data;
|
|
|
|
DBUG_ASSERT(!thd->cur_data);
|
|
|
|
thd->first_data= res->embedded_info->next;
|
|
|
|
if (res->embedded_info->last_errno &&
|
|
|
|
!res->embedded_info->fields_list)
|
|
|
|
{
|
|
|
|
embedded_get_error(mysql, res);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
mysql->warning_count= res->embedded_info->warning_count;
|
|
|
|
mysql->server_status= res->embedded_info->server_status;
|
|
|
|
mysql->field_count= res->fields;
|
2007-11-30 16:16:13 +01:00
|
|
|
if (!(mysql->fields= res->embedded_info->fields_list))
|
|
|
|
{
|
|
|
|
mysql->affected_rows= res->embedded_info->affected_rows;
|
|
|
|
mysql->insert_id= res->embedded_info->insert_id;
|
|
|
|
}
|
2007-10-31 15:16:53 +01:00
|
|
|
net_clear_error(&mysql->net);
|
2006-01-04 11:20:28 +01:00
|
|
|
mysql->info= 0;
|
|
|
|
|
|
|
|
if (res->embedded_info->info[0])
|
|
|
|
{
|
|
|
|
strmake(mysql->info_buffer, res->embedded_info->info, MYSQL_ERRMSG_SIZE-1);
|
|
|
|
mysql->info= mysql->info_buffer;
|
|
|
|
}
|
2003-09-16 13:06:25 +02:00
|
|
|
|
2006-01-04 11:20:28 +01:00
|
|
|
if (res->embedded_info->fields_list)
|
|
|
|
{
|
2003-09-16 13:06:25 +02:00
|
|
|
mysql->status=MYSQL_STATUS_GET_RESULT;
|
2006-01-04 11:20:28 +01:00
|
|
|
thd->cur_data= res;
|
|
|
|
}
|
|
|
|
else
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
my_free(res, MYF(0));
|
2003-09-16 13:06:25 +02:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-12-08 11:25:37 +01:00
|
|
|
static int emb_stmt_execute(MYSQL_STMT *stmt)
|
2003-09-17 12:18:18 +02:00
|
|
|
{
|
|
|
|
DBUG_ENTER("emb_stmt_execute");
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar header[5];
|
2006-01-04 11:20:28 +01:00
|
|
|
THD *thd;
|
2006-11-17 10:21:32 +01:00
|
|
|
my_bool res;
|
2006-01-04 11:20:28 +01:00
|
|
|
|
2005-01-11 16:02:44 +01:00
|
|
|
int4store(header, stmt->stmt_id);
|
2006-01-04 11:20:28 +01:00
|
|
|
header[4]= stmt->flags;
|
|
|
|
thd= (THD*)stmt->mysql->thd;
|
2003-09-17 12:18:18 +02:00
|
|
|
thd->client_param_count= stmt->param_count;
|
2003-09-17 17:48:53 +02:00
|
|
|
thd->client_params= stmt->params;
|
2006-11-17 10:21:32 +01:00
|
|
|
|
2006-11-17 10:30:26 +01:00
|
|
|
res= test(emb_advanced_command(stmt->mysql, COM_STMT_EXECUTE, 0, 0,
|
2006-11-17 10:21:32 +01:00
|
|
|
header, sizeof(header), 1, stmt) ||
|
2006-11-17 10:30:26 +01:00
|
|
|
emb_read_query_result(stmt->mysql));
|
2006-11-17 10:21:32 +01:00
|
|
|
stmt->affected_rows= stmt->mysql->affected_rows;
|
|
|
|
stmt->insert_id= stmt->mysql->insert_id;
|
2006-11-17 10:30:26 +01:00
|
|
|
stmt->server_status= stmt->mysql->server_status;
|
2006-11-17 10:21:32 +01:00
|
|
|
if (res)
|
2003-09-17 12:18:18 +02:00
|
|
|
{
|
|
|
|
NET *net= &stmt->mysql->net;
|
2007-10-31 15:16:53 +01:00
|
|
|
set_stmt_errmsg(stmt, net);
|
2003-09-17 12:18:18 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
2004-03-28 15:22:04 +02:00
|
|
|
int emb_read_binary_rows(MYSQL_STMT *stmt)
|
2003-09-17 17:48:53 +02:00
|
|
|
{
|
2004-03-28 15:22:04 +02:00
|
|
|
MYSQL_DATA *data;
|
|
|
|
if (!(data= emb_read_rows(stmt->mysql, 0, 0)))
|
2007-01-02 14:46:20 +01:00
|
|
|
{
|
2007-10-31 15:16:53 +01:00
|
|
|
set_stmt_errmsg(stmt, &stmt->mysql->net);
|
2004-03-28 15:22:04 +02:00
|
|
|
return 1;
|
2007-01-02 14:46:20 +01:00
|
|
|
}
|
2004-03-28 15:22:04 +02:00
|
|
|
stmt->result= *data;
|
|
|
|
my_free((char *) data, MYF(0));
|
2007-10-31 15:16:53 +01:00
|
|
|
set_stmt_errmsg(stmt, &stmt->mysql->net);
|
2004-03-28 15:22:04 +02:00
|
|
|
return 0;
|
2003-09-17 17:48:53 +02:00
|
|
|
}
|
|
|
|
|
2006-01-04 11:20:28 +01:00
|
|
|
int emb_read_rows_from_cursor(MYSQL_STMT *stmt)
|
|
|
|
{
|
|
|
|
MYSQL *mysql= stmt->mysql;
|
|
|
|
THD *thd= (THD*) mysql->thd;
|
|
|
|
MYSQL_DATA *res= thd->first_data;
|
|
|
|
DBUG_ASSERT(!thd->first_data->embedded_info->next);
|
|
|
|
thd->first_data= 0;
|
|
|
|
if (res->embedded_info->last_errno)
|
|
|
|
{
|
|
|
|
embedded_get_error(mysql, res);
|
2007-10-31 15:16:53 +01:00
|
|
|
set_stmt_errmsg(stmt, &mysql->net);
|
2006-01-04 11:20:28 +01:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
thd->cur_data= res;
|
|
|
|
mysql->warning_count= res->embedded_info->warning_count;
|
|
|
|
mysql->server_status= res->embedded_info->server_status;
|
2007-10-31 15:16:53 +01:00
|
|
|
net_clear_error(&mysql->net);
|
2006-01-04 11:20:28 +01:00
|
|
|
|
|
|
|
return emb_read_binary_rows(stmt);
|
|
|
|
}
|
|
|
|
|
2003-12-08 11:25:37 +01:00
|
|
|
int emb_unbuffered_fetch(MYSQL *mysql, char **row)
|
2003-09-19 11:05:28 +02:00
|
|
|
{
|
2006-01-04 11:20:28 +01:00
|
|
|
THD *thd= (THD*) mysql->thd;
|
|
|
|
MYSQL_DATA *data= thd->cur_data;
|
|
|
|
if (data && data->embedded_info->last_errno)
|
|
|
|
{
|
|
|
|
embedded_get_error(mysql, data);
|
|
|
|
thd->cur_data= 0;
|
|
|
|
return 1;
|
|
|
|
}
|
2003-09-19 11:05:28 +02:00
|
|
|
if (!data || !data->data)
|
|
|
|
{
|
|
|
|
*row= NULL;
|
|
|
|
if (data)
|
|
|
|
{
|
2006-01-04 11:20:28 +01:00
|
|
|
thd->cur_data= thd->first_data;
|
|
|
|
thd->first_data= data->embedded_info->next;
|
2003-09-19 11:05:28 +02:00
|
|
|
free_rows(data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
*row= (char *)data->data->data;
|
|
|
|
data->data= data->data->next;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-12-08 11:25:37 +01:00
|
|
|
static void emb_free_embedded_thd(MYSQL *mysql)
|
2003-09-29 11:09:51 +02:00
|
|
|
{
|
|
|
|
THD *thd= (THD*)mysql->thd;
|
2006-01-04 11:20:28 +01:00
|
|
|
thd->clear_data_list();
|
2003-10-04 16:28:08 +02:00
|
|
|
thread_count--;
|
2006-01-04 11:20:28 +01:00
|
|
|
thd->store_globals();
|
2003-09-29 11:09:51 +02:00
|
|
|
delete thd;
|
2004-05-17 09:05:57 +02:00
|
|
|
mysql->thd=0;
|
2003-09-29 11:09:51 +02:00
|
|
|
}
|
|
|
|
|
2004-03-10 18:12:24 +01:00
|
|
|
static const char * emb_read_statistics(MYSQL *mysql)
|
2003-10-04 16:28:08 +02:00
|
|
|
{
|
|
|
|
THD *thd= (THD*)mysql->thd;
|
2007-12-12 16:21:01 +01:00
|
|
|
return thd->is_error() ? thd->main_da.message() : "";
|
2003-10-04 16:28:08 +02:00
|
|
|
}
|
|
|
|
|
2003-12-08 11:25:37 +01:00
|
|
|
|
2006-01-04 11:20:28 +01:00
|
|
|
static MYSQL_RES * emb_store_result(MYSQL *mysql)
|
2003-12-08 11:25:37 +01:00
|
|
|
{
|
|
|
|
return mysql_store_result(mysql);
|
|
|
|
}
|
|
|
|
|
2004-02-14 17:26:21 +01:00
|
|
|
int emb_read_change_user_result(MYSQL *mysql,
|
|
|
|
char *buff __attribute__((unused)),
|
|
|
|
const char *passwd __attribute__((unused)))
|
|
|
|
{
|
|
|
|
return mysql_errno(mysql);
|
|
|
|
}
|
|
|
|
|
2003-09-16 13:06:25 +02:00
|
|
|
MYSQL_METHODS embedded_methods=
|
|
|
|
{
|
2006-01-04 11:20:28 +01:00
|
|
|
emb_read_query_result,
|
2003-09-16 13:06:25 +02:00
|
|
|
emb_advanced_command,
|
|
|
|
emb_read_rows,
|
2006-01-04 11:20:28 +01:00
|
|
|
emb_store_result,
|
2003-09-16 13:06:25 +02:00
|
|
|
emb_fetch_lengths,
|
2004-07-22 17:54:25 +02:00
|
|
|
emb_flush_use_result,
|
2003-09-16 13:06:25 +02:00
|
|
|
emb_list_fields,
|
2003-09-17 12:18:18 +02:00
|
|
|
emb_read_prepare_result,
|
2003-09-17 17:48:53 +02:00
|
|
|
emb_stmt_execute,
|
2003-09-19 11:05:28 +02:00
|
|
|
emb_read_binary_rows,
|
2003-09-29 11:09:51 +02:00
|
|
|
emb_unbuffered_fetch,
|
2003-10-04 16:28:08 +02:00
|
|
|
emb_free_embedded_thd,
|
2004-03-10 18:12:24 +01:00
|
|
|
emb_read_statistics,
|
2006-01-04 11:20:28 +01:00
|
|
|
emb_read_query_result,
|
|
|
|
emb_read_change_user_result,
|
|
|
|
emb_read_rows_from_cursor
|
2003-09-16 13:06:25 +02:00
|
|
|
};
|
|
|
|
|
2002-12-05 15:38:49 +01:00
|
|
|
/*
|
|
|
|
Make a copy of array and the strings array points to
|
|
|
|
*/
|
|
|
|
|
|
|
|
char **copy_arguments(int argc, char **argv)
|
|
|
|
{
|
|
|
|
uint length= 0;
|
|
|
|
char **from, **res, **end= argv+argc;
|
|
|
|
|
|
|
|
for (from=argv ; from != end ; from++)
|
|
|
|
length+= strlen(*from);
|
|
|
|
|
|
|
|
if ((res= (char**) my_malloc(sizeof(argv)*(argc+1)+length+argc,
|
|
|
|
MYF(MY_WME))))
|
|
|
|
{
|
|
|
|
char **to= res, *to_str= (char*) (res+argc+1);
|
|
|
|
for (from=argv ; from != end ;)
|
|
|
|
{
|
|
|
|
*to++= to_str;
|
|
|
|
to_str= strmov(to_str, *from++)+1;
|
|
|
|
}
|
|
|
|
*to= 0; // Last ptr should be null
|
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2006-03-06 22:08:29 +01:00
|
|
|
char ** copy_arguments_ptr= 0;
|
2001-10-02 04:53:00 +02:00
|
|
|
|
2003-12-18 12:51:22 +01:00
|
|
|
int init_embedded_server(int argc, char **argv, char **groups)
|
2002-11-06 11:42:44 +01:00
|
|
|
{
|
2004-04-05 12:56:05 +02:00
|
|
|
/*
|
|
|
|
This mess is to allow people to call the init function without
|
|
|
|
having to mess with a fake argv
|
|
|
|
*/
|
2002-11-06 11:42:44 +01:00
|
|
|
int *argcp;
|
|
|
|
char ***argvp;
|
|
|
|
int fake_argc = 1;
|
|
|
|
char *fake_argv[] = { (char *)"", 0 };
|
|
|
|
const char *fake_groups[] = { "server", "embedded", 0 };
|
2004-06-18 08:11:31 +02:00
|
|
|
my_bool acl_error;
|
2002-11-06 11:42:44 +01:00
|
|
|
if (argc)
|
|
|
|
{
|
2002-12-12 09:49:56 +01:00
|
|
|
argcp= &argc;
|
|
|
|
argvp= (char***) &argv;
|
2002-11-06 11:42:44 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2002-12-12 09:49:56 +01:00
|
|
|
argcp= &fake_argc;
|
|
|
|
argvp= (char ***) &fake_argv;
|
2002-11-06 11:42:44 +01:00
|
|
|
}
|
|
|
|
if (!groups)
|
2002-12-12 09:49:56 +01:00
|
|
|
groups= (char**) fake_groups;
|
2002-11-06 11:42:44 +01:00
|
|
|
|
2003-12-18 12:51:22 +01:00
|
|
|
my_progname= (char *)"mysql_embedded";
|
2002-11-06 11:42:44 +01:00
|
|
|
|
2006-01-23 08:58:14 +01:00
|
|
|
/*
|
|
|
|
Perform basic logger initialization logger. Should be called after
|
|
|
|
MY_INIT, as it initializes mutexes. Log tables are inited later.
|
|
|
|
*/
|
|
|
|
logger.init_base();
|
|
|
|
|
2003-06-03 12:02:57 +02:00
|
|
|
if (init_common_variables("my", *argcp, *argvp, (const char **)groups))
|
2002-11-06 11:42:44 +01:00
|
|
|
{
|
|
|
|
mysql_server_end();
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get default temporary directory */
|
|
|
|
opt_mysql_tmpdir=getenv("TMPDIR"); /* Use this if possible */
|
|
|
|
#if defined( __WIN__) || defined(OS2)
|
|
|
|
if (!opt_mysql_tmpdir)
|
|
|
|
opt_mysql_tmpdir=getenv("TEMP");
|
|
|
|
if (!opt_mysql_tmpdir)
|
|
|
|
opt_mysql_tmpdir=getenv("TMP");
|
|
|
|
#endif
|
|
|
|
if (!opt_mysql_tmpdir || !opt_mysql_tmpdir[0])
|
|
|
|
opt_mysql_tmpdir=(char*) P_tmpdir; /* purecov: inspected */
|
|
|
|
|
|
|
|
umask(((~my_umask) & 0666));
|
|
|
|
if (init_server_components())
|
|
|
|
{
|
|
|
|
mysql_server_end();
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
error_handler_hook = my_message_sql;
|
|
|
|
|
2004-06-18 08:11:31 +02:00
|
|
|
acl_error= 0;
|
2003-09-26 12:33:13 +02:00
|
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
2005-09-27 21:36:02 +02:00
|
|
|
if (!(acl_error= acl_init(opt_noacl)) &&
|
2004-06-18 08:11:31 +02:00
|
|
|
!opt_noacl)
|
2005-09-27 21:36:02 +02:00
|
|
|
(void) grant_init();
|
2004-06-18 08:11:31 +02:00
|
|
|
#endif
|
|
|
|
if (acl_error || my_tz_init((THD *)0, default_tz_name, opt_bootstrap))
|
2002-11-06 11:42:44 +01:00
|
|
|
{
|
|
|
|
mysql_server_end();
|
|
|
|
return 1;
|
|
|
|
}
|
2003-09-26 12:33:13 +02:00
|
|
|
|
2002-11-06 11:42:44 +01:00
|
|
|
init_max_user_conn();
|
|
|
|
init_update_queries();
|
|
|
|
|
|
|
|
#ifdef HAVE_DLOPEN
|
2003-09-26 12:33:13 +02:00
|
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
2002-11-06 11:42:44 +01:00
|
|
|
if (!opt_noacl)
|
2003-09-26 12:33:13 +02:00
|
|
|
#endif
|
2002-11-06 11:42:44 +01:00
|
|
|
udf_init();
|
|
|
|
#endif
|
|
|
|
|
|
|
|
(void) thr_setconcurrency(concurrency); // 10 by default
|
|
|
|
|
2006-08-21 15:34:29 +02:00
|
|
|
if (flush_time && flush_time != ~(ulong) 0L)
|
2002-11-06 11:42:44 +01:00
|
|
|
{
|
|
|
|
pthread_t hThread;
|
|
|
|
if (pthread_create(&hThread,&connection_attrib,handle_manager,0))
|
|
|
|
sql_print_error("Warning: Can't create thread to manage maintenance");
|
|
|
|
}
|
|
|
|
|
2007-01-27 21:26:28 +01:00
|
|
|
// FIXME initialize binlog_filter and rpl_filter if not already done
|
|
|
|
// corresponding delete is in clean_up()
|
|
|
|
if(!binlog_filter) binlog_filter = new Rpl_filter;
|
|
|
|
if(!rpl_filter) rpl_filter = new Rpl_filter;
|
|
|
|
|
2003-09-29 18:07:53 +02:00
|
|
|
if (opt_init_file)
|
|
|
|
{
|
|
|
|
if (read_init_file(opt_init_file))
|
|
|
|
{
|
|
|
|
mysql_server_end();
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-12-28 06:42:04 +01:00
|
|
|
execute_ddl_log_recovery();
|
2002-11-06 11:42:44 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-12-18 12:51:22 +01:00
|
|
|
void end_embedded_server()
|
2001-04-11 13:04:03 +02:00
|
|
|
{
|
2002-12-12 09:49:56 +01:00
|
|
|
my_free((char*) copy_arguments_ptr, MYF(MY_ALLOW_ZERO_PTR));
|
|
|
|
copy_arguments_ptr=0;
|
2001-10-02 04:53:00 +02:00
|
|
|
clean_up(0);
|
2001-08-10 18:37:36 +02:00
|
|
|
}
|
|
|
|
|
2002-06-17 13:24:51 +02:00
|
|
|
|
2006-06-01 14:06:42 +02:00
|
|
|
void init_embedded_mysql(MYSQL *mysql, int client_flag)
|
2002-06-17 13:24:51 +02:00
|
|
|
{
|
2002-12-16 14:33:29 +01:00
|
|
|
THD *thd = (THD *)mysql->thd;
|
2002-06-17 13:24:51 +02:00
|
|
|
thd->mysql= mysql;
|
2003-10-04 16:28:08 +02:00
|
|
|
mysql->server_version= server_version;
|
2006-01-04 11:20:28 +01:00
|
|
|
init_alloc_root(&mysql->field_alloc, 8192, 0);
|
2002-06-17 13:24:51 +02:00
|
|
|
}
|
2002-10-13 11:23:55 +02:00
|
|
|
|
2007-08-27 22:31:27 +02:00
|
|
|
/**
|
|
|
|
@brief Initialize a new THD for a connection in the embedded server
|
|
|
|
|
|
|
|
@param client_flag Client capabilities which this thread supports
|
|
|
|
@return pointer to the created THD object
|
|
|
|
|
|
|
|
@todo
|
|
|
|
This function copies code from several places in the server, including
|
|
|
|
create_new_thread(), and prepare_new_connection_state(). This should
|
|
|
|
be refactored to avoid code duplication.
|
|
|
|
*/
|
2006-06-01 14:06:42 +02:00
|
|
|
void *create_embedded_thd(int client_flag)
|
2002-06-17 13:24:51 +02:00
|
|
|
{
|
|
|
|
THD * thd= new THD;
|
2007-08-16 15:47:31 +02:00
|
|
|
thd->thread_id= thd->variables.pseudo_thread_id= thread_id++;
|
2002-06-17 13:24:51 +02:00
|
|
|
|
2006-01-04 11:20:28 +01:00
|
|
|
thd->thread_stack= (char*) &thd;
|
2002-06-17 13:24:51 +02:00
|
|
|
if (thd->store_globals())
|
|
|
|
{
|
|
|
|
fprintf(stderr,"store_globals failed.\n");
|
2004-07-22 21:00:50 +02:00
|
|
|
goto err;
|
2002-06-17 13:24:51 +02:00
|
|
|
}
|
2007-11-12 13:07:54 +01:00
|
|
|
lex_start(thd);
|
2002-06-17 13:24:51 +02:00
|
|
|
|
2007-02-23 12:13:55 +01:00
|
|
|
/* TODO - add init_connect command execution */
|
2004-07-22 21:00:50 +02:00
|
|
|
|
2005-07-26 09:08:00 +02:00
|
|
|
if (thd->variables.max_join_size == HA_POS_ERROR)
|
|
|
|
thd->options |= OPTION_BIG_SELECTS;
|
2002-06-17 13:24:51 +02:00
|
|
|
thd->proc_info=0; // Remove 'login'
|
|
|
|
thd->command=COM_SLEEP;
|
|
|
|
thd->version=refresh_version;
|
|
|
|
thd->set_time();
|
2004-07-22 21:00:50 +02:00
|
|
|
thd->init_for_queries();
|
2002-06-17 13:24:51 +02:00
|
|
|
thd->client_capabilities= client_flag;
|
2007-01-27 20:16:15 +01:00
|
|
|
thd->real_id= pthread_self();
|
2002-06-17 13:24:51 +02:00
|
|
|
|
2006-06-01 14:06:42 +02:00
|
|
|
thd->db= NULL;
|
|
|
|
thd->db_length= 0;
|
2003-09-26 12:33:13 +02:00
|
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
2005-09-28 16:43:46 +02:00
|
|
|
thd->security_ctx->db_access= DB_ACLS;
|
|
|
|
thd->security_ctx->master_access= ~NO_ACCESS;
|
2003-09-26 12:33:13 +02:00
|
|
|
#endif
|
2006-01-04 11:20:28 +01:00
|
|
|
thd->cur_data= 0;
|
|
|
|
thd->first_data= 0;
|
|
|
|
thd->data_tail= &thd->first_data;
|
|
|
|
bzero((char*) &thd->net, sizeof(thd->net));
|
2003-09-16 13:06:25 +02:00
|
|
|
|
2003-10-04 16:28:08 +02:00
|
|
|
thread_count++;
|
2002-06-17 13:24:51 +02:00
|
|
|
return thd;
|
2004-07-22 21:00:50 +02:00
|
|
|
err:
|
|
|
|
delete(thd);
|
|
|
|
return NULL;
|
2002-06-17 13:24:51 +02:00
|
|
|
}
|
2002-12-16 14:33:29 +01:00
|
|
|
|
2006-06-19 19:11:01 +02:00
|
|
|
|
2004-01-07 18:30:15 +01:00
|
|
|
#ifdef NO_EMBEDDED_ACCESS_CHECKS
|
2006-06-01 14:06:42 +02:00
|
|
|
int check_embedded_connection(MYSQL *mysql, const char *db)
|
2004-01-07 18:30:15 +01:00
|
|
|
{
|
2006-01-04 11:20:28 +01:00
|
|
|
int result;
|
2004-01-07 18:30:15 +01:00
|
|
|
THD *thd= (THD*)mysql->thd;
|
2006-06-19 19:11:01 +02:00
|
|
|
thd_init_client_charset(thd, mysql->charset->number);
|
|
|
|
thd->update_charset();
|
2005-09-21 07:29:47 +02:00
|
|
|
Security_context *sctx= thd->security_ctx;
|
2006-01-04 11:20:28 +01:00
|
|
|
sctx->host_or_ip= sctx->host= (char*) my_localhost;
|
|
|
|
strmake(sctx->priv_host, (char*) my_localhost, MAX_HOSTNAME-1);
|
2005-09-15 21:29:07 +02:00
|
|
|
sctx->priv_user= sctx->user= my_strdup(mysql->user, MYF(0));
|
2006-07-18 11:52:29 +02:00
|
|
|
result= check_user(thd, COM_CONNECT, NULL, 0, db, true);
|
2007-12-13 21:58:55 +01:00
|
|
|
net_end_statement(thd);
|
2006-01-04 11:20:28 +01:00
|
|
|
emb_read_query_result(mysql);
|
|
|
|
return result;
|
2004-01-07 18:30:15 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#else
|
2006-06-01 14:06:42 +02:00
|
|
|
int check_embedded_connection(MYSQL *mysql, const char *db)
|
2003-09-26 12:33:13 +02:00
|
|
|
{
|
|
|
|
THD *thd= (THD*)mysql->thd;
|
2005-09-28 16:43:46 +02:00
|
|
|
Security_context *sctx= thd->security_ctx;
|
2003-09-26 12:33:13 +02:00
|
|
|
int result;
|
|
|
|
char scramble_buff[SCRAMBLE_LENGTH];
|
|
|
|
int passwd_len;
|
|
|
|
|
2006-06-19 19:11:01 +02:00
|
|
|
thd_init_client_charset(thd, mysql->charset->number);
|
|
|
|
thd->update_charset();
|
2004-01-07 18:30:15 +01:00
|
|
|
if (mysql->options.client_ip)
|
|
|
|
{
|
2005-09-28 16:43:46 +02:00
|
|
|
sctx->host= my_strdup(mysql->options.client_ip, MYF(0));
|
|
|
|
sctx->ip= my_strdup(sctx->host, MYF(0));
|
2004-01-07 18:30:15 +01:00
|
|
|
}
|
|
|
|
else
|
2005-09-28 16:43:46 +02:00
|
|
|
sctx->host= (char*)my_localhost;
|
|
|
|
sctx->host_or_ip= sctx->host;
|
2003-09-26 12:33:13 +02:00
|
|
|
|
2005-09-28 16:43:46 +02:00
|
|
|
if (acl_check_host(sctx->host, sctx->ip))
|
2003-09-26 12:33:13 +02:00
|
|
|
{
|
|
|
|
result= ER_HOST_NOT_PRIVILEGED;
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2005-09-28 16:43:46 +02:00
|
|
|
sctx->user= my_strdup(mysql->user, MYF(0));
|
2003-09-26 12:33:13 +02:00
|
|
|
if (mysql->passwd && mysql->passwd[0])
|
|
|
|
{
|
|
|
|
memset(thd->scramble, 55, SCRAMBLE_LENGTH); // dummy scramble
|
|
|
|
thd->scramble[SCRAMBLE_LENGTH]= 0;
|
|
|
|
scramble(scramble_buff, thd->scramble, mysql->passwd);
|
|
|
|
passwd_len= SCRAMBLE_LENGTH;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
passwd_len= 0;
|
|
|
|
|
|
|
|
if((result= check_user(thd, COM_CONNECT,
|
2006-06-01 14:06:42 +02:00
|
|
|
scramble_buff, passwd_len, db, true)))
|
2003-09-26 12:33:13 +02:00
|
|
|
goto err;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
err:
|
|
|
|
{
|
|
|
|
NET *net= &mysql->net;
|
2008-02-28 18:55:46 +01:00
|
|
|
strmake(net->last_error, thd->main_da.message(), sizeof(net->last_error)-1);
|
2007-12-12 16:21:01 +01:00
|
|
|
memcpy(net->sqlstate,
|
|
|
|
mysql_errno_to_sqlstate(thd->main_da.sql_errno()),
|
|
|
|
sizeof(net->sqlstate)-1);
|
2003-09-26 12:33:13 +02:00
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2002-10-13 11:23:55 +02:00
|
|
|
C_MODE_END
|
2002-06-17 13:24:51 +02:00
|
|
|
|
2006-03-06 22:08:29 +01:00
|
|
|
void THD::clear_data_list()
|
|
|
|
{
|
|
|
|
while (first_data)
|
|
|
|
{
|
|
|
|
MYSQL_DATA *data= first_data;
|
|
|
|
first_data= data->embedded_info->next;
|
|
|
|
free_rows(data);
|
|
|
|
}
|
|
|
|
data_tail= &first_data;
|
|
|
|
free_rows(cur_data);
|
|
|
|
cur_data= 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void THD::clear_error()
|
|
|
|
{
|
2007-12-12 16:21:01 +01:00
|
|
|
if (main_da.is_error())
|
|
|
|
main_da.reset_diagnostics_area();
|
2006-03-06 22:08:29 +01:00
|
|
|
}
|
|
|
|
|
2004-12-21 07:05:58 +01:00
|
|
|
static char *dup_str_aux(MEM_ROOT *root, const char *from, uint length,
|
|
|
|
CHARSET_INFO *fromcs, CHARSET_INFO *tocs)
|
|
|
|
{
|
|
|
|
uint32 dummy32;
|
|
|
|
uint dummy_err;
|
|
|
|
char *result;
|
|
|
|
|
|
|
|
/* 'tocs' is set 0 when client issues SET character_set_results=NULL */
|
|
|
|
if (tocs && String::needs_conversion(0, fromcs, tocs, &dummy32))
|
|
|
|
{
|
|
|
|
uint new_len= (tocs->mbmaxlen * length) / fromcs->mbminlen + 1;
|
|
|
|
result= (char *)alloc_root(root, new_len);
|
|
|
|
length= copy_and_convert(result, new_len,
|
2004-12-21 09:31:38 +01:00
|
|
|
tocs, from, length, fromcs, &dummy_err);
|
2004-12-21 07:05:58 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
result= (char *)alloc_root(root, length + 1);
|
|
|
|
memcpy(result, from, length);
|
|
|
|
}
|
|
|
|
|
|
|
|
result[length]= 0;
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-01-04 11:20:28 +01:00
|
|
|
/*
|
|
|
|
creates new result and hooks it to the list
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
alloc_new_dataset()
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
allocs the MYSQL_DATA + embedded_query_result couple
|
|
|
|
to store the next query result,
|
|
|
|
links these two and attach it to the THD::data_tail
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
pointer to the newly created query result
|
|
|
|
*/
|
|
|
|
|
|
|
|
MYSQL_DATA *THD::alloc_new_dataset()
|
|
|
|
{
|
|
|
|
MYSQL_DATA *data;
|
|
|
|
struct embedded_query_result *emb_data;
|
|
|
|
if (!my_multi_malloc(MYF(MY_WME | MY_ZEROFILL),
|
|
|
|
&data, sizeof(*data),
|
|
|
|
&emb_data, sizeof(*emb_data),
|
|
|
|
NULL))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
emb_data->prev_ptr= &data->data;
|
|
|
|
cur_data= data;
|
|
|
|
*data_tail= data;
|
|
|
|
data_tail= &emb_data->next;
|
|
|
|
data->embedded_info= emb_data;
|
|
|
|
return data;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-12-12 16:21:01 +01:00
|
|
|
/**
|
|
|
|
Stores server_status and warning_count in the current
|
|
|
|
query result structures.
|
2006-01-04 11:20:28 +01:00
|
|
|
|
2007-12-12 16:21:01 +01:00
|
|
|
@param thd current thread
|
2006-01-04 11:20:28 +01:00
|
|
|
|
2007-12-12 16:21:01 +01:00
|
|
|
@note Should be called after we get the recordset-result.
|
2006-01-04 11:20:28 +01:00
|
|
|
*/
|
|
|
|
|
2007-12-12 16:21:01 +01:00
|
|
|
static
|
|
|
|
void
|
|
|
|
write_eof_packet(THD *thd, uint server_status, uint total_warn_count)
|
2006-01-04 11:20:28 +01:00
|
|
|
{
|
2006-11-13 17:06:45 +01:00
|
|
|
if (!thd->mysql) // bootstrap file handling
|
|
|
|
return;
|
2006-01-04 11:20:28 +01:00
|
|
|
/*
|
|
|
|
The following test should never be true, but it's better to do it
|
|
|
|
because if 'is_fatal_error' is set the server is not going to execute
|
|
|
|
other queries (see the if test in dispatch_command / COM_QUERY)
|
|
|
|
*/
|
|
|
|
if (thd->is_fatal_error)
|
|
|
|
thd->server_status&= ~SERVER_MORE_RESULTS_EXISTS;
|
2007-12-12 16:21:01 +01:00
|
|
|
thd->cur_data->embedded_info->server_status= server_status;
|
2006-01-04 11:20:28 +01:00
|
|
|
/*
|
|
|
|
Don't send warn count during SP execution, as the warn_list
|
|
|
|
is cleared between substatements, and mysqltest gets confused
|
|
|
|
*/
|
|
|
|
thd->cur_data->embedded_info->warning_count=
|
2007-12-12 16:21:01 +01:00
|
|
|
(thd->spcont ? 0 : min(total_warn_count, 65535));
|
2006-01-04 11:20:28 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
allocs new query result and initialises Protocol::alloc
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
Protocol::begin_dataset()
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
0 if success
|
|
|
|
1 if memory allocation failed
|
|
|
|
*/
|
|
|
|
|
|
|
|
int Protocol::begin_dataset()
|
|
|
|
{
|
|
|
|
MYSQL_DATA *data= thd->alloc_new_dataset();
|
|
|
|
if (!data)
|
|
|
|
return 1;
|
|
|
|
alloc= &data->alloc;
|
|
|
|
init_alloc_root(alloc,8192,0); /* Assume rowlength < 8192 */
|
|
|
|
alloc->min_malloc=sizeof(MYSQL_ROWS);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
remove last row of current recordset
|
|
|
|
|
|
|
|
SYNOPSIS
|
2007-01-30 22:48:05 +01:00
|
|
|
Protocol_text::remove_last_row()
|
2006-01-04 11:20:28 +01:00
|
|
|
|
|
|
|
NOTES
|
|
|
|
does the loop from the beginning of the current recordset to
|
|
|
|
the last record and cuts it off.
|
|
|
|
Not supposed to be frequently called.
|
|
|
|
*/
|
|
|
|
|
2007-01-30 22:48:05 +01:00
|
|
|
void Protocol_text::remove_last_row()
|
2006-01-04 11:20:28 +01:00
|
|
|
{
|
|
|
|
MYSQL_DATA *data= thd->cur_data;
|
|
|
|
MYSQL_ROWS **last_row_hook= &data->data;
|
|
|
|
uint count= data->rows;
|
2007-01-30 22:48:05 +01:00
|
|
|
DBUG_ENTER("Protocol_text::remove_last_row");
|
2006-01-04 11:20:28 +01:00
|
|
|
while (--count)
|
|
|
|
last_row_hook= &(*last_row_hook)->next;
|
|
|
|
|
|
|
|
*last_row_hook= 0;
|
|
|
|
data->embedded_info->prev_ptr= last_row_hook;
|
|
|
|
data->rows--;
|
|
|
|
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-11-03 19:07:17 +01:00
|
|
|
bool Protocol::send_fields(List<Item> *list, uint flags)
|
2002-12-17 16:33:25 +01:00
|
|
|
{
|
|
|
|
List_iterator_fast<Item> it(*list);
|
|
|
|
Item *item;
|
2003-09-16 13:06:25 +02:00
|
|
|
MYSQL_FIELD *client_field;
|
|
|
|
MEM_ROOT *field_alloc;
|
2004-12-21 07:05:58 +01:00
|
|
|
CHARSET_INFO *thd_cs= thd->variables.character_set_results;
|
|
|
|
CHARSET_INFO *cs= system_charset_info;
|
2006-01-04 11:20:28 +01:00
|
|
|
MYSQL_DATA *data;
|
2003-01-15 09:11:44 +01:00
|
|
|
DBUG_ENTER("send_fields");
|
2002-12-17 16:33:25 +01:00
|
|
|
|
2006-01-04 11:20:28 +01:00
|
|
|
if (!thd->mysql) // bootstrap file handling
|
2003-09-29 18:07:53 +02:00
|
|
|
DBUG_RETURN(0);
|
|
|
|
|
2006-01-04 11:20:28 +01:00
|
|
|
if (begin_dataset())
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
data= thd->cur_data;
|
|
|
|
data->fields= field_count= list->elements;
|
|
|
|
field_alloc= &data->alloc;
|
|
|
|
|
|
|
|
if (!(client_field= data->embedded_info->fields_list=
|
|
|
|
(MYSQL_FIELD*)alloc_root(field_alloc, sizeof(MYSQL_FIELD)*field_count)))
|
2002-12-17 16:33:25 +01:00
|
|
|
goto err;
|
|
|
|
|
|
|
|
while ((item= it++))
|
|
|
|
{
|
|
|
|
Send_field server_field;
|
|
|
|
item->make_field(&server_field);
|
|
|
|
|
2006-01-04 11:20:28 +01:00
|
|
|
/* Keep things compatible for old clients */
|
|
|
|
if (server_field.type == MYSQL_TYPE_VARCHAR)
|
|
|
|
server_field.type= MYSQL_TYPE_VAR_STRING;
|
|
|
|
|
2004-12-21 07:05:58 +01:00
|
|
|
client_field->db= dup_str_aux(field_alloc, server_field.db_name,
|
2004-12-21 09:31:38 +01:00
|
|
|
strlen(server_field.db_name), cs, thd_cs);
|
2004-12-21 07:05:58 +01:00
|
|
|
client_field->table= dup_str_aux(field_alloc, server_field.table_name,
|
2004-12-21 09:31:38 +01:00
|
|
|
strlen(server_field.table_name), cs, thd_cs);
|
2004-12-21 07:05:58 +01:00
|
|
|
client_field->name= dup_str_aux(field_alloc, server_field.col_name,
|
2004-12-21 09:31:38 +01:00
|
|
|
strlen(server_field.col_name), cs, thd_cs);
|
2004-12-21 07:05:58 +01:00
|
|
|
client_field->org_table= dup_str_aux(field_alloc, server_field.org_table_name,
|
2004-12-21 09:31:38 +01:00
|
|
|
strlen(server_field.org_table_name), cs, thd_cs);
|
2004-12-21 07:05:58 +01:00
|
|
|
client_field->org_name= dup_str_aux(field_alloc, server_field.org_col_name,
|
2004-12-21 09:31:38 +01:00
|
|
|
strlen(server_field.org_col_name), cs, thd_cs);
|
2004-12-21 07:05:58 +01:00
|
|
|
if (item->collation.collation == &my_charset_bin || thd_cs == NULL)
|
|
|
|
{
|
|
|
|
/* No conversion */
|
|
|
|
client_field->charsetnr= server_field.charsetnr;
|
|
|
|
client_field->length= server_field.length;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2006-06-02 19:33:22 +02:00
|
|
|
uint max_char_len;
|
2004-12-21 07:05:58 +01:00
|
|
|
/* With conversion */
|
|
|
|
client_field->charsetnr= thd_cs->number;
|
2006-06-02 19:33:22 +02:00
|
|
|
max_char_len= (server_field.type >= (int) MYSQL_TYPE_TINY_BLOB &&
|
|
|
|
server_field.type <= (int) MYSQL_TYPE_BLOB) ?
|
|
|
|
server_field.length / item->collation.collation->mbminlen :
|
|
|
|
server_field.length / item->collation.collation->mbmaxlen;
|
|
|
|
client_field->length= max_char_len * thd_cs->mbmaxlen;
|
2004-12-21 07:05:58 +01:00
|
|
|
}
|
2002-12-17 16:33:25 +01:00
|
|
|
client_field->type= server_field.type;
|
|
|
|
client_field->flags= server_field.flags;
|
|
|
|
client_field->decimals= server_field.decimals;
|
2003-02-14 10:47:41 +01:00
|
|
|
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);
|
2003-12-01 14:19:10 +01:00
|
|
|
|
2004-12-21 07:05:58 +01:00
|
|
|
client_field->catalog= dup_str_aux(field_alloc, "def", 3, cs, thd_cs);
|
2003-12-01 14:19:10 +01:00
|
|
|
client_field->catalog_length= 3;
|
2004-07-30 22:15:52 +02:00
|
|
|
|
2002-12-17 16:33:25 +01:00
|
|
|
if (INTERNAL_NUM_FIELD(client_field))
|
|
|
|
client_field->flags|= NUM_FLAG;
|
|
|
|
|
2004-08-28 08:32:27 +02:00
|
|
|
if (flags & (int) Protocol::SEND_DEFAULTS)
|
2002-12-17 16:33:25 +01:00
|
|
|
{
|
|
|
|
char buff[80];
|
|
|
|
String tmp(buff, sizeof(buff), default_charset_info), *res;
|
|
|
|
|
|
|
|
if (!(res=item->val_str(&tmp)))
|
2003-12-01 14:19:10 +01:00
|
|
|
{
|
|
|
|
client_field->def_length= 0;
|
2004-05-15 14:07:44 +02:00
|
|
|
client_field->def= strmake_root(field_alloc, "",0);
|
2003-12-01 14:19:10 +01:00
|
|
|
}
|
2002-12-17 16:33:25 +01:00
|
|
|
else
|
2003-12-01 14:19:10 +01:00
|
|
|
{
|
2004-02-13 14:20:56 +01:00
|
|
|
client_field->def_length= res->length();
|
2004-05-15 14:07:44 +02:00
|
|
|
client_field->def= strmake_root(field_alloc, res->ptr(),
|
|
|
|
client_field->def_length);
|
2003-12-01 14:19:10 +01:00
|
|
|
}
|
2002-12-17 16:33:25 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
client_field->def=0;
|
|
|
|
client_field->max_length= 0;
|
|
|
|
++client_field;
|
|
|
|
}
|
2006-01-04 11:20:28 +01:00
|
|
|
|
|
|
|
if (flags & SEND_EOF)
|
2007-12-12 16:21:01 +01:00
|
|
|
write_eof_packet(thd, thd->server_status, thd->total_warn_count);
|
2002-12-17 16:33:25 +01:00
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
DBUG_RETURN(prepare_for_send(list));
|
2002-12-17 16:33:25 +01:00
|
|
|
err:
|
2004-10-28 13:02:09 +02:00
|
|
|
my_error(ER_OUT_OF_RESOURCES, MYF(0)); /* purecov: inspected */
|
2003-01-15 09:11:44 +01:00
|
|
|
DBUG_RETURN(1); /* purecov: inspected */
|
2002-12-17 16:33:25 +01:00
|
|
|
}
|
|
|
|
|
2003-01-20 15:47:25 +01:00
|
|
|
bool Protocol::write()
|
2002-11-06 11:42:44 +01:00
|
|
|
{
|
2003-09-29 18:07:53 +02:00
|
|
|
if (!thd->mysql) // bootstrap file handling
|
|
|
|
return false;
|
|
|
|
|
2003-01-20 15:47:25 +01:00
|
|
|
*next_field= 0;
|
|
|
|
return false;
|
2002-11-06 11:42:44 +01:00
|
|
|
}
|
2002-06-17 13:24:51 +02:00
|
|
|
|
2007-01-30 22:48:05 +01:00
|
|
|
bool Protocol_binary::write()
|
2003-09-17 17:48:53 +02:00
|
|
|
{
|
|
|
|
MYSQL_ROWS *cur;
|
2006-01-04 11:20:28 +01:00
|
|
|
MYSQL_DATA *data= thd->cur_data;
|
2003-09-17 17:48:53 +02:00
|
|
|
|
|
|
|
data->rows++;
|
2006-01-04 11:20:28 +01:00
|
|
|
if (!(cur= (MYSQL_ROWS *)alloc_root(alloc,
|
|
|
|
sizeof(MYSQL_ROWS)+packet->length())))
|
2003-09-17 17:48:53 +02:00
|
|
|
{
|
|
|
|
my_error(ER_OUT_OF_RESOURCES,MYF(0));
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
cur->data= (MYSQL_ROW)(((char *)cur) + sizeof(MYSQL_ROWS));
|
2003-09-18 09:25:00 +02:00
|
|
|
memcpy(cur->data, packet->ptr()+1, packet->length()-1);
|
2004-12-19 18:28:52 +01:00
|
|
|
cur->length= packet->length(); /* To allow us to do sanity checks */
|
2003-09-17 17:48:53 +02:00
|
|
|
|
2006-01-04 11:20:28 +01:00
|
|
|
*data->embedded_info->prev_ptr= cur;
|
|
|
|
data->embedded_info->prev_ptr= &cur->next;
|
2003-09-19 11:05:28 +02:00
|
|
|
cur->next= 0;
|
|
|
|
|
2003-09-17 17:48:53 +02:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2007-12-12 16:21:01 +01:00
|
|
|
|
|
|
|
/**
|
|
|
|
Embedded library implementation of OK response.
|
|
|
|
|
|
|
|
This function is used by the server to write 'OK' packet to
|
|
|
|
the "network" when the server is compiled as an embedded library.
|
|
|
|
Since there is no network in the embedded configuration,
|
|
|
|
a different implementation is necessary.
|
|
|
|
Instead of marshalling response parameters to a network representation
|
|
|
|
and then writing it to the socket, here we simply copy the data to the
|
|
|
|
corresponding client-side connection structures.
|
|
|
|
|
|
|
|
@sa Server implementation of net_send_ok in protocol.cc for
|
|
|
|
description of the arguments.
|
|
|
|
|
|
|
|
@return The function does not return errors.
|
|
|
|
*/
|
|
|
|
|
2002-06-17 13:24:51 +02:00
|
|
|
void
|
2007-12-12 16:21:01 +01:00
|
|
|
net_send_ok(THD *thd,
|
|
|
|
uint server_status, uint total_warn_count,
|
|
|
|
ha_rows affected_rows, ulonglong id, const char *message)
|
2002-06-17 13:24:51 +02:00
|
|
|
{
|
2007-12-12 16:21:01 +01:00
|
|
|
DBUG_ENTER("emb_net_send_ok");
|
2006-01-04 11:20:28 +01:00
|
|
|
MYSQL_DATA *data;
|
|
|
|
MYSQL *mysql= thd->mysql;
|
2007-12-12 16:21:01 +01:00
|
|
|
|
2003-09-29 18:07:53 +02:00
|
|
|
if (!mysql) // bootstrap file handling
|
|
|
|
DBUG_VOID_RETURN;
|
2006-01-04 11:20:28 +01:00
|
|
|
if (!(data= thd->alloc_new_dataset()))
|
|
|
|
return;
|
|
|
|
data->embedded_info->affected_rows= affected_rows;
|
|
|
|
data->embedded_info->insert_id= id;
|
2002-06-17 13:24:51 +02:00
|
|
|
if (message)
|
2006-01-04 11:20:28 +01:00
|
|
|
strmake(data->embedded_info->info, message,
|
|
|
|
sizeof(data->embedded_info->info)-1);
|
|
|
|
|
2007-12-12 16:21:01 +01:00
|
|
|
write_eof_packet(thd, server_status, total_warn_count);
|
2006-01-04 11:20:28 +01:00
|
|
|
thd->cur_data= 0;
|
2002-06-17 13:24:51 +02:00
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
2007-12-12 16:21:01 +01:00
|
|
|
|
|
|
|
/**
|
|
|
|
Embedded library implementation of EOF response.
|
|
|
|
|
|
|
|
@sa net_send_ok
|
|
|
|
|
|
|
|
@return This function does not return errors.
|
|
|
|
*/
|
|
|
|
|
2002-10-13 11:23:55 +02:00
|
|
|
void
|
2007-12-12 16:21:01 +01:00
|
|
|
net_send_eof(THD *thd, uint server_status, uint total_warn_count)
|
2002-10-13 11:23:55 +02:00
|
|
|
{
|
2007-12-12 16:21:01 +01:00
|
|
|
write_eof_packet(thd, server_status, total_warn_count);
|
2006-01-04 11:20:28 +01:00
|
|
|
thd->cur_data= 0;
|
2002-10-13 11:23:55 +02:00
|
|
|
}
|
|
|
|
|
2006-01-04 11:20:28 +01:00
|
|
|
|
|
|
|
void net_send_error_packet(THD *thd, uint sql_errno, const char *err)
|
|
|
|
{
|
|
|
|
MYSQL_DATA *data= thd->cur_data ? thd->cur_data : thd->alloc_new_dataset();
|
|
|
|
struct embedded_query_result *ei= data->embedded_info;
|
|
|
|
|
|
|
|
ei->last_errno= sql_errno;
|
|
|
|
strmake(ei->info, err, sizeof(ei->info)-1);
|
|
|
|
strmov(ei->sqlstate, mysql_errno_to_sqlstate(sql_errno));
|
2007-11-29 07:37:07 +01:00
|
|
|
ei->server_status= thd->server_status;
|
2006-01-04 11:20:28 +01:00
|
|
|
thd->cur_data= 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-01-30 22:48:05 +01:00
|
|
|
void Protocol_text::prepare_for_resend()
|
2003-01-15 09:11:44 +01:00
|
|
|
{
|
2003-09-16 13:06:25 +02:00
|
|
|
MYSQL_ROWS *cur;
|
2006-01-04 11:20:28 +01:00
|
|
|
MYSQL_DATA *data= thd->cur_data;
|
2003-01-15 09:11:44 +01:00
|
|
|
DBUG_ENTER("send_data");
|
|
|
|
|
2006-11-13 07:39:15 +01:00
|
|
|
if (!thd->mysql) // bootstrap file handling
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
|
2003-09-16 13:06:25 +02:00
|
|
|
data->rows++;
|
2003-01-15 09:11:44 +01:00
|
|
|
if (!(cur= (MYSQL_ROWS *)alloc_root(alloc, sizeof(MYSQL_ROWS)+(field_count + 1) * sizeof(char *))))
|
|
|
|
{
|
|
|
|
my_error(ER_OUT_OF_RESOURCES,MYF(0));
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
cur->data= (MYSQL_ROW)(((char *)cur) + sizeof(MYSQL_ROWS));
|
|
|
|
|
2006-01-04 11:20:28 +01:00
|
|
|
*data->embedded_info->prev_ptr= cur;
|
|
|
|
data->embedded_info->prev_ptr= &cur->next;
|
2003-01-15 09:11:44 +01:00
|
|
|
next_field=cur->data;
|
2006-01-04 11:20:28 +01:00
|
|
|
next_mysql_field= data->embedded_info->fields_list;
|
2006-12-14 23:51:37 +01:00
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
2007-01-30 22:48:05 +01:00
|
|
|
bool Protocol_text::store_null()
|
2003-01-20 15:47:25 +01:00
|
|
|
{
|
|
|
|
*(next_field++)= NULL;
|
|
|
|
++next_mysql_field;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
bool Protocol::net_store_data(const uchar *from, size_t length)
|
2003-01-15 09:11:44 +01:00
|
|
|
{
|
2003-09-10 09:09:24 +02:00
|
|
|
char *field_buf;
|
2003-09-29 18:07:53 +02:00
|
|
|
if (!thd->mysql) // bootstrap file handling
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
return FALSE;
|
2003-09-29 18:07:53 +02:00
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (!(field_buf= (char*) alloc_root(alloc, length + sizeof(uint) + 1)))
|
|
|
|
return TRUE;
|
2003-09-10 09:09:24 +02:00
|
|
|
*(uint *)field_buf= length;
|
|
|
|
*next_field= field_buf + sizeof(uint);
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
memcpy((uchar*) *next_field, from, length);
|
2003-09-11 06:46:31 +02:00
|
|
|
(*next_field)[length]= 0;
|
2003-01-20 15:47:25 +01:00
|
|
|
if (next_mysql_field->max_length < length)
|
|
|
|
next_mysql_field->max_length=length;
|
|
|
|
++next_field;
|
|
|
|
++next_mysql_field;
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
return FALSE;
|
2003-01-20 15:47:25 +01:00
|
|
|
}
|
|
|
|
|