2006-02-22 00:40:07 +01:00
|
|
|
/* Copyright (C) 2006 MySQL AB
|
2006-02-16 17:38:33 +01:00
|
|
|
|
|
|
|
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
|
2006-12-27 02:23:51 +01:00
|
|
|
the Free Software Foundation; version 2 of the License.
|
2006-02-16 17:38:33 +01:00
|
|
|
|
|
|
|
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 */
|
|
|
|
|
|
|
|
/* Some general useful functions */
|
|
|
|
|
2006-02-28 22:07:14 +01:00
|
|
|
#ifdef USE_PRAGMA_IMPLEMENTATION
|
|
|
|
#pragma implementation
|
|
|
|
#endif
|
|
|
|
|
2006-02-16 17:38:33 +01:00
|
|
|
#include "mysql_priv.h"
|
|
|
|
|
|
|
|
#ifdef WITH_PARTITION_STORAGE_ENGINE
|
2006-04-13 22:49:29 +02:00
|
|
|
#include "ha_partition.h"
|
|
|
|
|
2006-02-16 17:38:33 +01:00
|
|
|
|
2006-03-18 15:48:21 +01:00
|
|
|
partition_info *partition_info::get_clone()
|
|
|
|
{
|
|
|
|
if (!this)
|
|
|
|
return 0;
|
|
|
|
List_iterator<partition_element> part_it(partitions);
|
|
|
|
partition_element *part;
|
|
|
|
partition_info *clone= new partition_info();
|
|
|
|
if (!clone)
|
|
|
|
{
|
|
|
|
mem_alloc_error(sizeof(partition_info));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
memcpy(clone, this, sizeof(partition_info));
|
|
|
|
clone->partitions.empty();
|
|
|
|
|
|
|
|
while ((part= (part_it++)))
|
|
|
|
{
|
|
|
|
List_iterator<partition_element> subpart_it(part->subpartitions);
|
|
|
|
partition_element *subpart;
|
|
|
|
partition_element *part_clone= new partition_element();
|
|
|
|
if (!part_clone)
|
|
|
|
{
|
|
|
|
mem_alloc_error(sizeof(partition_element));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
memcpy(part_clone, part, sizeof(partition_element));
|
|
|
|
part_clone->subpartitions.empty();
|
|
|
|
while ((subpart= (subpart_it++)))
|
|
|
|
{
|
|
|
|
partition_element *subpart_clone= new partition_element();
|
|
|
|
if (!subpart_clone)
|
|
|
|
{
|
|
|
|
mem_alloc_error(sizeof(partition_element));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
memcpy(subpart_clone, subpart, sizeof(partition_element));
|
|
|
|
part_clone->subpartitions.push_back(subpart_clone);
|
|
|
|
}
|
|
|
|
clone->partitions.push_back(part_clone);
|
|
|
|
}
|
|
|
|
return clone;
|
|
|
|
}
|
2006-02-16 17:38:33 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
Create a memory area where default partition names are stored and fill it
|
|
|
|
up with the names.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
create_default_partition_names()
|
|
|
|
part_no Partition number for subparts
|
|
|
|
no_parts Number of partitions
|
|
|
|
start_no Starting partition number
|
|
|
|
subpart Is it subpartitions
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
A pointer to the memory area of the default partition names
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
A support routine for the partition code where default values are
|
|
|
|
generated.
|
|
|
|
The external routine needing this code is check_partition_info
|
|
|
|
*/
|
|
|
|
|
2006-04-21 14:37:09 +02:00
|
|
|
#define MAX_PART_NAME_SIZE 8
|
2006-02-16 17:38:33 +01: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
|
|
|
char *partition_info::create_default_partition_names(uint part_no,
|
2007-08-13 15:11:25 +02:00
|
|
|
uint no_parts_arg,
|
2006-04-12 05:35:48 +02:00
|
|
|
uint start_no)
|
2006-02-16 17:38:33 +01:00
|
|
|
{
|
2007-08-13 15:11:25 +02:00
|
|
|
char *ptr= (char*) sql_calloc(no_parts_arg*MAX_PART_NAME_SIZE);
|
2006-02-16 17:38:33 +01:00
|
|
|
char *move_ptr= ptr;
|
|
|
|
uint i= 0;
|
|
|
|
DBUG_ENTER("create_default_partition_names");
|
|
|
|
|
|
|
|
if (likely(ptr != 0))
|
|
|
|
{
|
|
|
|
do
|
|
|
|
{
|
2006-04-12 05:35:48 +02:00
|
|
|
my_sprintf(move_ptr, (move_ptr,"p%u", (start_no + i)));
|
2006-02-16 17:38:33 +01:00
|
|
|
move_ptr+=MAX_PART_NAME_SIZE;
|
2007-08-13 15:11:25 +02:00
|
|
|
} while (++i < no_parts_arg);
|
2006-02-16 17:38:33 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2007-08-13 15:11:25 +02:00
|
|
|
mem_alloc_error(no_parts_arg*MAX_PART_NAME_SIZE);
|
2006-02-16 17:38:33 +01:00
|
|
|
}
|
|
|
|
DBUG_RETURN(ptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-04-12 05:35:48 +02:00
|
|
|
/*
|
|
|
|
Create a unique name for the subpartition as part_name'sp''subpart_no'
|
|
|
|
SYNOPSIS
|
|
|
|
create_subpartition_name()
|
|
|
|
subpart_no Number of subpartition
|
|
|
|
part_name Name of partition
|
|
|
|
RETURN VALUES
|
|
|
|
>0 A reference to the created name string
|
|
|
|
0 Memory allocation error
|
|
|
|
*/
|
|
|
|
|
2006-04-21 14:37:09 +02:00
|
|
|
char *partition_info::create_subpartition_name(uint subpart_no,
|
|
|
|
const char *part_name)
|
2006-04-12 05:35:48 +02:00
|
|
|
{
|
|
|
|
uint size_alloc= strlen(part_name) + MAX_PART_NAME_SIZE;
|
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
|
|
|
char *ptr= (char*) sql_calloc(size_alloc);
|
2006-04-12 05:35:48 +02:00
|
|
|
DBUG_ENTER("create_subpartition_name");
|
|
|
|
|
|
|
|
if (likely(ptr != NULL))
|
|
|
|
{
|
|
|
|
my_sprintf(ptr, (ptr, "%ssp%u", part_name, subpart_no));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
mem_alloc_error(size_alloc);
|
|
|
|
}
|
|
|
|
DBUG_RETURN(ptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-02-16 17:38:33 +01:00
|
|
|
/*
|
|
|
|
Set up all the default partitions not set-up by the user in the SQL
|
|
|
|
statement. Also perform a number of checks that the user hasn't tried
|
|
|
|
to use default values where no defaults exists.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
set_up_default_partitions()
|
|
|
|
file A reference to a handler of the table
|
2006-06-27 22:19:27 +02:00
|
|
|
info Create info
|
2006-02-16 17:38:33 +01:00
|
|
|
start_no Starting partition number
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
TRUE Error, attempted default values not possible
|
|
|
|
FALSE Ok, default partitions set-up
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
The routine uses the underlying handler of the partitioning to define
|
|
|
|
the default number of partitions. For some handlers this requires
|
|
|
|
knowledge of the maximum number of rows to be stored in the table.
|
|
|
|
This routine only accepts HASH and KEY partitioning and thus there is
|
|
|
|
no subpartitioning if this routine is successful.
|
|
|
|
The external routine needing this code is check_partition_info
|
|
|
|
*/
|
|
|
|
|
2006-06-27 22:19:27 +02:00
|
|
|
bool partition_info::set_up_default_partitions(handler *file,
|
|
|
|
HA_CREATE_INFO *info,
|
2006-02-16 17:38:33 +01:00
|
|
|
uint start_no)
|
|
|
|
{
|
|
|
|
uint i;
|
|
|
|
char *default_name;
|
|
|
|
bool result= TRUE;
|
|
|
|
DBUG_ENTER("partition_info::set_up_default_partitions");
|
|
|
|
|
|
|
|
if (part_type != HASH_PARTITION)
|
|
|
|
{
|
|
|
|
const char *error_string;
|
|
|
|
if (part_type == RANGE_PARTITION)
|
|
|
|
error_string= partition_keywords[PKW_RANGE].str;
|
|
|
|
else
|
|
|
|
error_string= partition_keywords[PKW_LIST].str;
|
|
|
|
my_error(ER_PARTITIONS_MUST_BE_DEFINED_ERROR, MYF(0), error_string);
|
|
|
|
goto end;
|
|
|
|
}
|
2007-04-05 10:25:39 +02:00
|
|
|
|
|
|
|
if ((no_parts == 0) &&
|
|
|
|
((no_parts= file->get_default_no_partitions(info)) == 0))
|
|
|
|
{
|
|
|
|
my_error(ER_PARTITION_NOT_DEFINED_ERROR, MYF(0), "partitions");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
2006-02-16 17:38:33 +01:00
|
|
|
if (unlikely(no_parts > MAX_PARTITIONS))
|
|
|
|
{
|
|
|
|
my_error(ER_TOO_MANY_PARTITIONS_ERROR, MYF(0));
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
if (unlikely((!(default_name= create_default_partition_names(0, no_parts,
|
2006-04-12 05:35:48 +02:00
|
|
|
start_no)))))
|
2006-02-16 17:38:33 +01:00
|
|
|
goto end;
|
|
|
|
i= 0;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
partition_element *part_elem= new partition_element();
|
|
|
|
if (likely(part_elem != 0 &&
|
|
|
|
(!partitions.push_back(part_elem))))
|
|
|
|
{
|
|
|
|
part_elem->engine_type= default_engine_type;
|
|
|
|
part_elem->partition_name= default_name;
|
|
|
|
default_name+=MAX_PART_NAME_SIZE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
mem_alloc_error(sizeof(partition_element));
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
} while (++i < no_parts);
|
|
|
|
result= FALSE;
|
|
|
|
end:
|
|
|
|
DBUG_RETURN(result);
|
|
|
|
}
|
|
|
|
|
2006-02-22 00:40:07 +01:00
|
|
|
|
2006-02-16 17:38:33 +01:00
|
|
|
/*
|
|
|
|
Set up all the default subpartitions not set-up by the user in the SQL
|
|
|
|
statement. Also perform a number of checks that the default partitioning
|
|
|
|
becomes an allowed partitioning scheme.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
set_up_default_subpartitions()
|
|
|
|
file A reference to a handler of the table
|
2006-06-27 22:19:27 +02:00
|
|
|
info Create info
|
2006-02-16 17:38:33 +01:00
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
TRUE Error, attempted default values not possible
|
|
|
|
FALSE Ok, default partitions set-up
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
The routine uses the underlying handler of the partitioning to define
|
|
|
|
the default number of partitions. For some handlers this requires
|
|
|
|
knowledge of the maximum number of rows to be stored in the table.
|
|
|
|
This routine is only called for RANGE or LIST partitioning and those
|
|
|
|
need to be specified so only subpartitions are specified.
|
|
|
|
The external routine needing this code is check_partition_info
|
|
|
|
*/
|
|
|
|
|
|
|
|
bool partition_info::set_up_default_subpartitions(handler *file,
|
2006-06-27 22:19:27 +02:00
|
|
|
HA_CREATE_INFO *info)
|
2006-02-16 17:38:33 +01:00
|
|
|
{
|
2006-02-16 19:01:14 +01:00
|
|
|
uint i, j;
|
2006-02-16 17:38:33 +01:00
|
|
|
bool result= TRUE;
|
|
|
|
partition_element *part_elem;
|
|
|
|
List_iterator<partition_element> part_it(partitions);
|
|
|
|
DBUG_ENTER("partition_info::set_up_default_subpartitions");
|
|
|
|
|
|
|
|
if (no_subparts == 0)
|
2006-06-27 22:19:27 +02:00
|
|
|
no_subparts= file->get_default_no_partitions(info);
|
2006-02-16 17:38:33 +01:00
|
|
|
if (unlikely((no_parts * no_subparts) > MAX_PARTITIONS))
|
|
|
|
{
|
|
|
|
my_error(ER_TOO_MANY_PARTITIONS_ERROR, MYF(0));
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
i= 0;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
part_elem= part_it++;
|
|
|
|
j= 0;
|
|
|
|
do
|
|
|
|
{
|
2006-04-21 14:43:07 +02:00
|
|
|
partition_element *subpart_elem= new partition_element(part_elem);
|
2006-02-16 17:38:33 +01:00
|
|
|
if (likely(subpart_elem != 0 &&
|
|
|
|
(!part_elem->subpartitions.push_back(subpart_elem))))
|
|
|
|
{
|
2006-04-12 05:35:48 +02:00
|
|
|
char *ptr= create_subpartition_name(j, part_elem->partition_name);
|
|
|
|
if (!ptr)
|
|
|
|
goto end;
|
2006-02-16 17:38:33 +01:00
|
|
|
subpart_elem->engine_type= default_engine_type;
|
2006-04-12 05:35:48 +02:00
|
|
|
subpart_elem->partition_name= ptr;
|
2006-02-16 17:38:33 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
mem_alloc_error(sizeof(partition_element));
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
} while (++j < no_subparts);
|
|
|
|
} while (++i < no_parts);
|
|
|
|
result= FALSE;
|
|
|
|
end:
|
|
|
|
DBUG_RETURN(result);
|
|
|
|
}
|
|
|
|
|
2006-02-22 00:40:07 +01:00
|
|
|
|
2006-02-16 17:38:33 +01:00
|
|
|
/*
|
|
|
|
Support routine for check_partition_info
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
set_up_defaults_for_partitioning()
|
|
|
|
file A reference to a handler of the table
|
2006-06-27 22:19:27 +02:00
|
|
|
info Create info
|
2006-02-16 17:38:33 +01:00
|
|
|
start_no Starting partition number
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
TRUE Error, attempted default values not possible
|
|
|
|
FALSE Ok, default partitions set-up
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
Set up defaults for partition or subpartition (cannot set-up for both,
|
|
|
|
this will return an error.
|
|
|
|
*/
|
|
|
|
|
|
|
|
bool partition_info::set_up_defaults_for_partitioning(handler *file,
|
2006-06-27 22:19:27 +02:00
|
|
|
HA_CREATE_INFO *info,
|
2006-02-16 17:38:33 +01:00
|
|
|
uint start_no)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("partition_info::set_up_defaults_for_partitioning");
|
|
|
|
|
|
|
|
if (!default_partitions_setup)
|
|
|
|
{
|
|
|
|
default_partitions_setup= TRUE;
|
|
|
|
if (use_default_partitions)
|
2006-06-27 22:19:27 +02:00
|
|
|
DBUG_RETURN(set_up_default_partitions(file, info, start_no));
|
2006-02-16 17:38:33 +01:00
|
|
|
if (is_sub_partitioned() &&
|
|
|
|
use_default_subpartitions)
|
2006-06-27 22:19:27 +02:00
|
|
|
DBUG_RETURN(set_up_default_subpartitions(file, info));
|
2006-02-16 17:38:33 +01:00
|
|
|
}
|
|
|
|
DBUG_RETURN(FALSE);
|
|
|
|
}
|
|
|
|
|
2006-02-22 00:40:07 +01:00
|
|
|
|
2006-02-16 19:01:14 +01:00
|
|
|
/*
|
|
|
|
A support function to check if a partition element's name is unique
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
has_unique_name()
|
|
|
|
partition_element element to check
|
|
|
|
|
|
|
|
RETURN VALUES
|
|
|
|
TRUE Has unique name
|
|
|
|
FALSE Doesn't
|
|
|
|
*/
|
2006-02-22 00:40:07 +01:00
|
|
|
|
2006-02-16 17:38:33 +01:00
|
|
|
bool partition_info::has_unique_name(partition_element *element)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("partition_info::has_unique_name");
|
|
|
|
|
|
|
|
const char *name_to_check= element->partition_name;
|
|
|
|
List_iterator<partition_element> parts_it(partitions);
|
|
|
|
|
|
|
|
partition_element *el;
|
WL#2977 and WL#2712 global and session-level variable to set the binlog format (row/statement),
and new binlog format called "mixed" (which is statement-based except if only row-based is correct,
in this cset it means if UDF or UUID is used; more cases could be added in later 5.1 release):
SET GLOBAL|SESSION BINLOG_FORMAT=row|statement|mixed|default;
the global default is statement unless cluster is enabled (then it's row) as in 5.1-alpha.
It's not possible to use SET on this variable if a session is currently in row-based mode and has open temporary tables (because CREATE
TEMPORARY TABLE was not binlogged so temp table is not known on slave), or if NDB is enabled (because
NDB does not support such change on-the-fly, though it will later), of if in a stored function (see below).
The added tests test the possibility or impossibility to SET, their effects, and the mixed mode,
including in prepared statements and in stored procedures and functions.
Caveats:
a) The mixed mode will not work for stored functions: in mixed mode, a stored function will
always be binlogged as one call and in a statement-based way (e.g. INSERT VALUES(myfunc()) or SELECT myfunc()).
b) for the same reason, changing the thread's binlog format inside a stored function is
refused with an error message.
c) the same problems apply to triggers; implementing b) for triggers will be done later (will ask
Dmitri).
Additionally, as the binlog format is now changeable by each user for his session, I remove the implication
which was done at startup, where row-based automatically set log-bin-trust-routine-creators to 1
(not possible anymore as a user can now switch to stmt-based and do nasty things again), and automatically
set --innodb-locks-unsafe-for-binlog to 1 (was anyway theoretically incorrect as it disabled
phantom protection).
Plus fixes for compiler warnings.
2006-02-25 22:21:03 +01:00
|
|
|
while ((el= (parts_it++)))
|
2006-02-16 17:38:33 +01:00
|
|
|
{
|
|
|
|
if (!(my_strcasecmp(system_charset_info, el->partition_name,
|
|
|
|
name_to_check)) && el != element)
|
|
|
|
DBUG_RETURN(FALSE);
|
|
|
|
|
2006-02-22 00:40:07 +01:00
|
|
|
if (!el->subpartitions.is_empty())
|
2006-02-16 17:38:33 +01:00
|
|
|
{
|
2006-02-22 00:40:07 +01:00
|
|
|
partition_element *sub_el;
|
|
|
|
List_iterator<partition_element> subparts_it(el->subpartitions);
|
WL#2977 and WL#2712 global and session-level variable to set the binlog format (row/statement),
and new binlog format called "mixed" (which is statement-based except if only row-based is correct,
in this cset it means if UDF or UUID is used; more cases could be added in later 5.1 release):
SET GLOBAL|SESSION BINLOG_FORMAT=row|statement|mixed|default;
the global default is statement unless cluster is enabled (then it's row) as in 5.1-alpha.
It's not possible to use SET on this variable if a session is currently in row-based mode and has open temporary tables (because CREATE
TEMPORARY TABLE was not binlogged so temp table is not known on slave), or if NDB is enabled (because
NDB does not support such change on-the-fly, though it will later), of if in a stored function (see below).
The added tests test the possibility or impossibility to SET, their effects, and the mixed mode,
including in prepared statements and in stored procedures and functions.
Caveats:
a) The mixed mode will not work for stored functions: in mixed mode, a stored function will
always be binlogged as one call and in a statement-based way (e.g. INSERT VALUES(myfunc()) or SELECT myfunc()).
b) for the same reason, changing the thread's binlog format inside a stored function is
refused with an error message.
c) the same problems apply to triggers; implementing b) for triggers will be done later (will ask
Dmitri).
Additionally, as the binlog format is now changeable by each user for his session, I remove the implication
which was done at startup, where row-based automatically set log-bin-trust-routine-creators to 1
(not possible anymore as a user can now switch to stmt-based and do nasty things again), and automatically
set --innodb-locks-unsafe-for-binlog to 1 (was anyway theoretically incorrect as it disabled
phantom protection).
Plus fixes for compiler warnings.
2006-02-25 22:21:03 +01:00
|
|
|
while ((sub_el= (subparts_it++)))
|
2006-02-22 00:40:07 +01:00
|
|
|
{
|
|
|
|
if (!(my_strcasecmp(system_charset_info, sub_el->partition_name,
|
|
|
|
name_to_check)) && sub_el != element)
|
|
|
|
DBUG_RETURN(FALSE);
|
|
|
|
}
|
2006-02-16 17:38:33 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
DBUG_RETURN(TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
A support function to check partition names for duplication in a
|
|
|
|
partitioned table
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
has_unique_names()
|
|
|
|
|
|
|
|
RETURN VALUES
|
|
|
|
TRUE Has unique part and subpart names
|
|
|
|
FALSE Doesn't
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
Checks that the list of names in the partitions doesn't contain any
|
|
|
|
duplicated names.
|
|
|
|
*/
|
2006-02-22 00:40:07 +01:00
|
|
|
|
2006-02-16 17:38:33 +01:00
|
|
|
char *partition_info::has_unique_names()
|
|
|
|
{
|
|
|
|
DBUG_ENTER("partition_info::has_unique_names");
|
|
|
|
|
|
|
|
List_iterator<partition_element> parts_it(partitions);
|
|
|
|
|
|
|
|
partition_element *el;
|
WL#2977 and WL#2712 global and session-level variable to set the binlog format (row/statement),
and new binlog format called "mixed" (which is statement-based except if only row-based is correct,
in this cset it means if UDF or UUID is used; more cases could be added in later 5.1 release):
SET GLOBAL|SESSION BINLOG_FORMAT=row|statement|mixed|default;
the global default is statement unless cluster is enabled (then it's row) as in 5.1-alpha.
It's not possible to use SET on this variable if a session is currently in row-based mode and has open temporary tables (because CREATE
TEMPORARY TABLE was not binlogged so temp table is not known on slave), or if NDB is enabled (because
NDB does not support such change on-the-fly, though it will later), of if in a stored function (see below).
The added tests test the possibility or impossibility to SET, their effects, and the mixed mode,
including in prepared statements and in stored procedures and functions.
Caveats:
a) The mixed mode will not work for stored functions: in mixed mode, a stored function will
always be binlogged as one call and in a statement-based way (e.g. INSERT VALUES(myfunc()) or SELECT myfunc()).
b) for the same reason, changing the thread's binlog format inside a stored function is
refused with an error message.
c) the same problems apply to triggers; implementing b) for triggers will be done later (will ask
Dmitri).
Additionally, as the binlog format is now changeable by each user for his session, I remove the implication
which was done at startup, where row-based automatically set log-bin-trust-routine-creators to 1
(not possible anymore as a user can now switch to stmt-based and do nasty things again), and automatically
set --innodb-locks-unsafe-for-binlog to 1 (was anyway theoretically incorrect as it disabled
phantom protection).
Plus fixes for compiler warnings.
2006-02-25 22:21:03 +01:00
|
|
|
while ((el= (parts_it++)))
|
2006-02-16 17:38:33 +01:00
|
|
|
{
|
|
|
|
if (! has_unique_name(el))
|
|
|
|
DBUG_RETURN(el->partition_name);
|
|
|
|
|
2006-02-22 00:40:07 +01:00
|
|
|
if (!el->subpartitions.is_empty())
|
2006-02-16 17:38:33 +01:00
|
|
|
{
|
2006-02-22 00:40:07 +01:00
|
|
|
List_iterator<partition_element> subparts_it(el->subpartitions);
|
|
|
|
partition_element *subel;
|
WL#2977 and WL#2712 global and session-level variable to set the binlog format (row/statement),
and new binlog format called "mixed" (which is statement-based except if only row-based is correct,
in this cset it means if UDF or UUID is used; more cases could be added in later 5.1 release):
SET GLOBAL|SESSION BINLOG_FORMAT=row|statement|mixed|default;
the global default is statement unless cluster is enabled (then it's row) as in 5.1-alpha.
It's not possible to use SET on this variable if a session is currently in row-based mode and has open temporary tables (because CREATE
TEMPORARY TABLE was not binlogged so temp table is not known on slave), or if NDB is enabled (because
NDB does not support such change on-the-fly, though it will later), of if in a stored function (see below).
The added tests test the possibility or impossibility to SET, their effects, and the mixed mode,
including in prepared statements and in stored procedures and functions.
Caveats:
a) The mixed mode will not work for stored functions: in mixed mode, a stored function will
always be binlogged as one call and in a statement-based way (e.g. INSERT VALUES(myfunc()) or SELECT myfunc()).
b) for the same reason, changing the thread's binlog format inside a stored function is
refused with an error message.
c) the same problems apply to triggers; implementing b) for triggers will be done later (will ask
Dmitri).
Additionally, as the binlog format is now changeable by each user for his session, I remove the implication
which was done at startup, where row-based automatically set log-bin-trust-routine-creators to 1
(not possible anymore as a user can now switch to stmt-based and do nasty things again), and automatically
set --innodb-locks-unsafe-for-binlog to 1 (was anyway theoretically incorrect as it disabled
phantom protection).
Plus fixes for compiler warnings.
2006-02-25 22:21:03 +01:00
|
|
|
while ((subel= (subparts_it++)))
|
2006-02-22 00:40:07 +01:00
|
|
|
{
|
|
|
|
if (! has_unique_name(subel))
|
|
|
|
DBUG_RETURN(subel->partition_name);
|
|
|
|
}
|
2006-02-16 17:38:33 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
DBUG_RETURN(NULL);
|
|
|
|
}
|
|
|
|
|
2006-03-31 19:39:44 +02:00
|
|
|
|
|
|
|
/*
|
2008-01-09 13:15:50 +01:00
|
|
|
Check that the partition/subpartition is setup to use the correct
|
|
|
|
storage engine
|
|
|
|
SYNOPSIS
|
|
|
|
check_engine_condition()
|
|
|
|
p_elem Partition element
|
|
|
|
table_engine_set Have user specified engine on table level
|
|
|
|
inout::engine_type Current engine used
|
|
|
|
inout::first Is it first partition
|
|
|
|
RETURN VALUE
|
|
|
|
TRUE Failed check
|
|
|
|
FALSE Ok
|
|
|
|
DESCRIPTION
|
|
|
|
Specified engine for table and partitions p0 and pn
|
|
|
|
Must be correct both on CREATE and ALTER commands
|
|
|
|
table p0 pn res (0 - OK, 1 - FAIL)
|
|
|
|
- - - 0
|
|
|
|
- - x 1
|
|
|
|
- x - 1
|
|
|
|
- x x 0
|
|
|
|
x - - 0
|
|
|
|
x - x 0
|
|
|
|
x x - 0
|
|
|
|
x x x 0
|
|
|
|
i.e:
|
|
|
|
- All subpartitions must use the same engine
|
|
|
|
AND it must be the same as the partition.
|
|
|
|
- All partitions must use the same engine
|
|
|
|
AND it must be the same as the table.
|
|
|
|
- if one does NOT specify an engine on the table level
|
|
|
|
then one must either NOT specify any engine on any
|
|
|
|
partition/subpartition OR for ALL partitions/subpartitions
|
|
|
|
Note:
|
|
|
|
When ALTER a table, the engines are already set for all levels
|
|
|
|
(table, all partitions and subpartitions). So if one want to
|
|
|
|
change the storage engine, one must specify it on the table level
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
static bool check_engine_condition(partition_element *p_elem,
|
|
|
|
bool table_engine_set,
|
|
|
|
handlerton **engine_type,
|
|
|
|
bool *first)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("check_engine_condition");
|
|
|
|
|
2008-02-25 21:18:50 +01:00
|
|
|
DBUG_PRINT("enter", ("p_eng %s t_eng %s t_eng_set %u first %u state %u",
|
|
|
|
ha_resolve_storage_engine_name(p_elem->engine_type),
|
|
|
|
ha_resolve_storage_engine_name(*engine_type),
|
2008-01-09 13:15:50 +01:00
|
|
|
table_engine_set, *first, p_elem->part_state));
|
|
|
|
if (*first && !table_engine_set)
|
|
|
|
{
|
|
|
|
*engine_type= p_elem->engine_type;
|
2008-02-25 21:18:50 +01:00
|
|
|
DBUG_PRINT("info", ("setting table_engine = %s",
|
|
|
|
ha_resolve_storage_engine_name(*engine_type)));
|
2008-01-09 13:15:50 +01:00
|
|
|
}
|
|
|
|
*first= FALSE;
|
|
|
|
if ((table_engine_set &&
|
|
|
|
(p_elem->engine_type != (*engine_type) &&
|
|
|
|
p_elem->engine_type)) ||
|
|
|
|
(!table_engine_set &&
|
|
|
|
p_elem->engine_type != (*engine_type)))
|
|
|
|
{
|
|
|
|
DBUG_RETURN(TRUE);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
DBUG_RETURN(FALSE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-03-31 19:39:44 +02:00
|
|
|
|
2008-01-09 13:15:50 +01:00
|
|
|
/*
|
|
|
|
Check engine mix that it is correct
|
|
|
|
Current limitation is that all partitions and subpartitions
|
|
|
|
must use the same storage engine.
|
2006-03-31 19:39:44 +02:00
|
|
|
SYNOPSIS
|
|
|
|
check_engine_mix()
|
2008-01-09 13:15:50 +01:00
|
|
|
inout::engine_type Current engine used
|
|
|
|
table_engine_set Have user specified engine on table level
|
2006-03-31 19:39:44 +02:00
|
|
|
RETURN VALUE
|
2008-01-09 13:15:50 +01:00
|
|
|
TRUE Error, mixed engines
|
|
|
|
FALSE Ok, no mixed engines
|
2006-03-31 19:39:44 +02:00
|
|
|
DESCRIPTION
|
|
|
|
Current check verifies only that all handlers are the same.
|
|
|
|
Later this check will be more sophisticated.
|
2008-01-09 13:15:50 +01:00
|
|
|
(specified partition handler ) specified table handler
|
|
|
|
(NDB, NDB) NDB OK
|
|
|
|
(MYISAM, MYISAM) - OK
|
|
|
|
(MYISAM, -) - NOT OK
|
|
|
|
(MYISAM, -) MYISAM OK
|
|
|
|
(- , MYISAM) - NOT OK
|
|
|
|
(- , -) MYISAM OK
|
|
|
|
(-,-) - OK
|
|
|
|
(NDB, MYISAM) * NOT OK
|
2006-03-31 19:39:44 +02:00
|
|
|
*/
|
|
|
|
|
2008-01-09 13:15:50 +01:00
|
|
|
bool partition_info::check_engine_mix(handlerton *engine_type,
|
|
|
|
bool table_engine_set)
|
2006-03-31 19:39:44 +02:00
|
|
|
{
|
2008-01-09 13:15:50 +01:00
|
|
|
handlerton *old_engine_type= engine_type;
|
|
|
|
bool first= TRUE;
|
|
|
|
uint no_parts= partitions.elements;
|
2006-03-31 19:39:44 +02:00
|
|
|
DBUG_ENTER("partition_info::check_engine_mix");
|
2008-02-25 21:18:50 +01:00
|
|
|
DBUG_PRINT("info", ("in: engine_type = %s, table_engine_set = %u",
|
|
|
|
ha_resolve_storage_engine_name(engine_type),
|
2008-01-09 13:15:50 +01:00
|
|
|
table_engine_set));
|
|
|
|
if (no_parts)
|
2006-03-31 19:39:44 +02:00
|
|
|
{
|
2008-01-09 13:15:50 +01:00
|
|
|
List_iterator<partition_element> part_it(partitions);
|
|
|
|
uint i= 0;
|
|
|
|
do
|
2006-03-31 19:39:44 +02:00
|
|
|
{
|
2008-01-09 13:15:50 +01:00
|
|
|
partition_element *part_elem= part_it++;
|
2008-02-25 21:18:50 +01:00
|
|
|
DBUG_PRINT("info", ("part = %d engine = %s table_engine_set %u",
|
|
|
|
i, ha_resolve_storage_engine_name(part_elem->engine_type),
|
2008-01-09 13:15:50 +01:00
|
|
|
table_engine_set));
|
|
|
|
if (is_sub_partitioned() &&
|
|
|
|
part_elem->subpartitions.elements)
|
|
|
|
{
|
|
|
|
uint no_subparts= part_elem->subpartitions.elements;
|
|
|
|
uint j= 0;
|
|
|
|
List_iterator<partition_element> sub_it(part_elem->subpartitions);
|
|
|
|
do
|
|
|
|
{
|
|
|
|
partition_element *sub_elem= sub_it++;
|
2008-02-25 21:18:50 +01:00
|
|
|
DBUG_PRINT("info", ("sub = %d engine = %s table_engie_set %u",
|
|
|
|
j, ha_resolve_storage_engine_name(sub_elem->engine_type),
|
2008-01-09 13:15:50 +01:00
|
|
|
table_engine_set));
|
|
|
|
if (check_engine_condition(sub_elem, table_engine_set,
|
|
|
|
&engine_type, &first))
|
|
|
|
goto error;
|
|
|
|
} while (++j < no_subparts);
|
|
|
|
/* ensure that the partition also has correct engine */
|
|
|
|
if (check_engine_condition(part_elem, table_engine_set,
|
|
|
|
&engine_type, &first))
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
else if (check_engine_condition(part_elem, table_engine_set,
|
|
|
|
&engine_type, &first))
|
|
|
|
goto error;
|
|
|
|
} while (++i < no_parts);
|
|
|
|
}
|
2008-02-25 21:18:50 +01:00
|
|
|
DBUG_PRINT("info", ("engine_type = %s",
|
|
|
|
ha_resolve_storage_engine_name(engine_type)));
|
2008-01-09 13:15:50 +01:00
|
|
|
if (!engine_type)
|
|
|
|
engine_type= old_engine_type;
|
|
|
|
if (engine_type->flags & HTON_NO_PARTITION)
|
2006-05-23 13:37:03 +02:00
|
|
|
{
|
2006-10-01 03:31:13 +02:00
|
|
|
my_error(ER_PARTITION_MERGE_ERROR, MYF(0));
|
2006-05-23 13:37:03 +02:00
|
|
|
DBUG_RETURN(TRUE);
|
|
|
|
}
|
2008-02-25 21:18:50 +01:00
|
|
|
DBUG_PRINT("info", ("out: engine_type = %s",
|
|
|
|
ha_resolve_storage_engine_name(engine_type)));
|
2008-01-09 13:15:50 +01:00
|
|
|
DBUG_ASSERT(engine_type != partition_hton);
|
2006-05-23 13:37:03 +02:00
|
|
|
DBUG_RETURN(FALSE);
|
2008-01-09 13:15:50 +01:00
|
|
|
error:
|
|
|
|
/*
|
|
|
|
Mixed engines not yet supported but when supported it will need
|
|
|
|
the partition handler
|
|
|
|
*/
|
|
|
|
DBUG_RETURN(TRUE);
|
2006-03-31 19:39:44 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
This routine allocates an array for all range constants to achieve a fast
|
|
|
|
check what partition a certain value belongs to. At the same time it does
|
|
|
|
also check that the range constants are defined in increasing order and
|
|
|
|
that the expressions are constant integer expressions.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
check_range_constants()
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
TRUE An error occurred during creation of range constants
|
|
|
|
FALSE Successful creation of range constant mapping
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
This routine is called from check_partition_info to get a quick error
|
|
|
|
before we came too far into the CREATE TABLE process. It is also called
|
|
|
|
from fix_partition_func every time we open the .frm file. It is only
|
|
|
|
called for RANGE PARTITIONed tables.
|
|
|
|
*/
|
|
|
|
|
|
|
|
bool partition_info::check_range_constants()
|
|
|
|
{
|
|
|
|
partition_element* part_def;
|
2006-06-06 17:54:21 +02:00
|
|
|
longlong current_largest;
|
|
|
|
longlong part_range_value;
|
|
|
|
bool first= TRUE;
|
2006-03-31 19:39:44 +02:00
|
|
|
uint i;
|
|
|
|
List_iterator<partition_element> it(partitions);
|
|
|
|
bool result= TRUE;
|
2006-04-18 04:51:34 +02:00
|
|
|
bool signed_flag= !part_expr->unsigned_flag;
|
2006-03-31 19:39:44 +02:00
|
|
|
DBUG_ENTER("partition_info::check_range_constants");
|
|
|
|
DBUG_PRINT("enter", ("INT_RESULT with %d parts", no_parts));
|
|
|
|
|
2006-11-01 18:41:09 +01:00
|
|
|
LINT_INIT(current_largest);
|
|
|
|
|
2006-03-31 19:39:44 +02:00
|
|
|
part_result_type= INT_RESULT;
|
|
|
|
range_int_array= (longlong*)sql_alloc(no_parts * sizeof(longlong));
|
|
|
|
if (unlikely(range_int_array == NULL))
|
|
|
|
{
|
|
|
|
mem_alloc_error(no_parts * sizeof(longlong));
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
i= 0;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
part_def= it++;
|
|
|
|
if ((i != (no_parts - 1)) || !defined_max_value)
|
|
|
|
{
|
2006-06-06 17:54:21 +02:00
|
|
|
part_range_value= part_def->range_value;
|
|
|
|
if (!signed_flag)
|
|
|
|
part_range_value-= 0x8000000000000000ULL;
|
|
|
|
}
|
2006-03-31 19:39:44 +02:00
|
|
|
else
|
2006-06-06 17:54:21 +02:00
|
|
|
part_range_value= LONGLONG_MAX;
|
|
|
|
if (first)
|
2006-03-31 19:39:44 +02:00
|
|
|
{
|
2006-06-06 17:54:21 +02:00
|
|
|
current_largest= part_range_value;
|
|
|
|
range_int_array[0]= part_range_value;
|
|
|
|
first= FALSE;
|
2006-03-31 19:39:44 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2006-06-06 17:54:21 +02:00
|
|
|
if (likely(current_largest < part_range_value))
|
2006-04-18 04:51:34 +02:00
|
|
|
{
|
2006-06-06 17:54:21 +02:00
|
|
|
current_largest= part_range_value;
|
|
|
|
range_int_array[i]= part_range_value;
|
2006-04-18 04:51:34 +02:00
|
|
|
}
|
2007-11-26 07:28:25 +01:00
|
|
|
else if (defined_max_value &&
|
|
|
|
current_largest == part_range_value &&
|
|
|
|
part_range_value == LONGLONG_MAX &&
|
|
|
|
i == (no_parts - 1))
|
|
|
|
{
|
|
|
|
range_int_array[i]= part_range_value;
|
|
|
|
}
|
2006-04-18 04:51:34 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
my_error(ER_RANGE_NOT_INCREASING_ERROR, MYF(0));
|
|
|
|
goto end;
|
|
|
|
}
|
2006-03-31 19:39:44 +02:00
|
|
|
}
|
|
|
|
} while (++i < no_parts);
|
|
|
|
result= FALSE;
|
|
|
|
end:
|
|
|
|
DBUG_RETURN(result);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2006-04-18 04:51:34 +02:00
|
|
|
Support routines for check_list_constants used by qsort to sort the
|
|
|
|
constant list expressions. One routine for unsigned and one for signed.
|
2006-03-31 19:39:44 +02:00
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
list_part_cmp()
|
|
|
|
a First list constant to compare with
|
|
|
|
b Second list constant to compare with
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
+1 a > b
|
|
|
|
0 a == b
|
|
|
|
-1 a < b
|
|
|
|
*/
|
|
|
|
|
|
|
|
int partition_info::list_part_cmp(const void* a, const void* b)
|
|
|
|
{
|
|
|
|
longlong a1= ((LIST_PART_ENTRY*)a)->list_value;
|
|
|
|
longlong b1= ((LIST_PART_ENTRY*)b)->list_value;
|
|
|
|
if (a1 < b1)
|
|
|
|
return -1;
|
|
|
|
else if (a1 > b1)
|
|
|
|
return +1;
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
This routine allocates an array for all list constants to achieve a fast
|
|
|
|
check what partition a certain value belongs to. At the same time it does
|
|
|
|
also check that there are no duplicates among the list constants and that
|
|
|
|
that the list expressions are constant integer expressions.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
check_list_constants()
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
TRUE An error occurred during creation of list constants
|
|
|
|
FALSE Successful creation of list constant mapping
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
This routine is called from check_partition_info to get a quick error
|
|
|
|
before we came too far into the CREATE TABLE process. It is also called
|
|
|
|
from fix_partition_func every time we open the .frm file. It is only
|
|
|
|
called for LIST PARTITIONed tables.
|
|
|
|
*/
|
|
|
|
|
|
|
|
bool partition_info::check_list_constants()
|
|
|
|
{
|
|
|
|
uint i;
|
|
|
|
uint list_index= 0;
|
2006-04-18 04:51:34 +02:00
|
|
|
part_elem_value *list_value;
|
2006-03-31 19:39:44 +02:00
|
|
|
bool result= TRUE;
|
2006-06-06 17:54:21 +02:00
|
|
|
longlong curr_value, prev_value, type_add, calc_value;
|
2006-03-31 19:39:44 +02:00
|
|
|
partition_element* part_def;
|
|
|
|
bool found_null= FALSE;
|
|
|
|
List_iterator<partition_element> list_func_it(partitions);
|
|
|
|
DBUG_ENTER("partition_info::check_list_constants");
|
|
|
|
|
|
|
|
part_result_type= INT_RESULT;
|
|
|
|
no_list_values= 0;
|
|
|
|
/*
|
|
|
|
We begin by calculating the number of list values that have been
|
|
|
|
defined in the first step.
|
|
|
|
|
|
|
|
We use this number to allocate a properly sized array of structs
|
|
|
|
to keep the partition id and the value to use in that partition.
|
|
|
|
In the second traversal we assign them values in the struct array.
|
|
|
|
|
|
|
|
Finally we sort the array of structs in order of values to enable
|
|
|
|
a quick binary search for the proper value to discover the
|
|
|
|
partition id.
|
|
|
|
After sorting the array we check that there are no duplicates in the
|
|
|
|
list.
|
|
|
|
*/
|
|
|
|
|
|
|
|
i= 0;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
part_def= list_func_it++;
|
|
|
|
if (part_def->has_null_value)
|
|
|
|
{
|
|
|
|
if (found_null)
|
|
|
|
{
|
|
|
|
my_error(ER_MULTIPLE_DEF_CONST_IN_LIST_PART_ERROR, MYF(0));
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
has_null_value= TRUE;
|
|
|
|
has_null_part_id= i;
|
|
|
|
found_null= TRUE;
|
|
|
|
}
|
2006-04-18 04:51:34 +02:00
|
|
|
List_iterator<part_elem_value> list_val_it1(part_def->list_val_list);
|
2006-03-31 19:39:44 +02:00
|
|
|
while (list_val_it1++)
|
|
|
|
no_list_values++;
|
|
|
|
} while (++i < no_parts);
|
|
|
|
list_func_it.rewind();
|
2006-05-30 06:08:48 +02:00
|
|
|
list_array= (LIST_PART_ENTRY*)sql_alloc((no_list_values+1) *
|
|
|
|
sizeof(LIST_PART_ENTRY));
|
2006-03-31 19:39:44 +02:00
|
|
|
if (unlikely(list_array == NULL))
|
|
|
|
{
|
|
|
|
mem_alloc_error(no_list_values * sizeof(LIST_PART_ENTRY));
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
i= 0;
|
2006-06-06 17:54:21 +02:00
|
|
|
/*
|
|
|
|
Fix to be able to reuse signed sort functions also for unsigned
|
|
|
|
partition functions.
|
|
|
|
*/
|
|
|
|
type_add= (longlong)(part_expr->unsigned_flag ?
|
|
|
|
0x8000000000000000ULL :
|
|
|
|
0ULL);
|
|
|
|
|
2006-03-31 19:39:44 +02:00
|
|
|
do
|
|
|
|
{
|
|
|
|
part_def= list_func_it++;
|
2006-04-18 04:51:34 +02:00
|
|
|
List_iterator<part_elem_value> list_val_it2(part_def->list_val_list);
|
2006-03-31 19:39:44 +02:00
|
|
|
while ((list_value= list_val_it2++))
|
|
|
|
{
|
2006-06-06 17:54:21 +02:00
|
|
|
calc_value= list_value->value - type_add;
|
|
|
|
list_array[list_index].list_value= calc_value;
|
2006-03-31 19:39:44 +02:00
|
|
|
list_array[list_index++].partition_id= i;
|
|
|
|
}
|
|
|
|
} while (++i < no_parts);
|
|
|
|
|
2006-06-14 15:22:27 +02:00
|
|
|
if (fixed && no_list_values)
|
2006-03-31 19:39:44 +02:00
|
|
|
{
|
2006-06-14 14:35:19 +02:00
|
|
|
bool first= TRUE;
|
2007-10-18 13:17:21 +02:00
|
|
|
my_qsort((void*)list_array, no_list_values, sizeof(LIST_PART_ENTRY),
|
|
|
|
&list_part_cmp);
|
2006-05-30 06:08:48 +02:00
|
|
|
|
2006-11-30 02:40:42 +01:00
|
|
|
i= 0;
|
|
|
|
LINT_INIT(prev_value);
|
2006-05-30 06:08:48 +02:00
|
|
|
do
|
2006-03-31 19:39:44 +02:00
|
|
|
{
|
2006-05-30 06:08:48 +02:00
|
|
|
DBUG_ASSERT(i < no_list_values);
|
|
|
|
curr_value= list_array[i].list_value;
|
2006-06-14 14:35:19 +02:00
|
|
|
if (likely(first || prev_value != curr_value))
|
2006-05-30 06:08:48 +02:00
|
|
|
{
|
|
|
|
prev_value= curr_value;
|
2006-06-14 14:35:19 +02:00
|
|
|
first= FALSE;
|
2006-05-30 06:08:48 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
my_error(ER_MULTIPLE_DEF_CONST_IN_LIST_PART_ERROR, MYF(0));
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
} while (++i < no_list_values);
|
2006-06-05 05:16:08 +02:00
|
|
|
}
|
2006-03-31 19:39:44 +02:00
|
|
|
result= FALSE;
|
|
|
|
end:
|
|
|
|
DBUG_RETURN(result);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
This code is used early in the CREATE TABLE and ALTER TABLE process.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
check_partition_info()
|
|
|
|
file A reference to a handler of the table
|
2006-06-27 22:19:27 +02:00
|
|
|
info Create info
|
2006-03-31 19:39:44 +02:00
|
|
|
engine_type Return value for used engine in partitions
|
2006-06-23 07:21:26 +02:00
|
|
|
check_partition_function Should we check the partition function
|
2006-03-31 19:39:44 +02:00
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
TRUE Error, something went wrong
|
|
|
|
FALSE Ok, full partition data structures are now generated
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
We will check that the partition info requested is possible to set-up in
|
|
|
|
this version. This routine is an extension of the parser one could say.
|
|
|
|
If defaults were used we will generate default data structures for all
|
|
|
|
partitions.
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
2006-04-18 04:51:34 +02:00
|
|
|
bool partition_info::check_partition_info(THD *thd, handlerton **eng_type,
|
2006-07-12 17:33:22 +02:00
|
|
|
handler *file, HA_CREATE_INFO *info,
|
2006-06-23 07:21:26 +02:00
|
|
|
bool check_partition_function)
|
2006-03-31 19:39:44 +02:00
|
|
|
{
|
2008-01-09 13:15:50 +01:00
|
|
|
handlerton *table_engine= default_engine_type;
|
2006-03-31 19:39:44 +02:00
|
|
|
uint i, tot_partitions;
|
2008-01-09 13:15:50 +01:00
|
|
|
bool result= TRUE, table_engine_set;
|
2006-03-31 19:39:44 +02:00
|
|
|
char *same_name;
|
|
|
|
DBUG_ENTER("partition_info::check_partition_info");
|
2008-01-09 13:15:50 +01:00
|
|
|
DBUG_ASSERT(default_engine_type != partition_hton);
|
2006-03-31 19:39:44 +02:00
|
|
|
|
2008-02-25 21:18:50 +01:00
|
|
|
DBUG_PRINT("info", ("default table_engine = %s",
|
|
|
|
ha_resolve_storage_engine_name(table_engine)));
|
2006-06-23 07:21:26 +02:00
|
|
|
if (check_partition_function)
|
2006-04-05 12:39:06 +02:00
|
|
|
{
|
2006-09-26 08:30:40 +02:00
|
|
|
int err= 0;
|
2006-07-21 16:23:32 +02:00
|
|
|
|
2006-06-23 07:21:26 +02:00
|
|
|
if (part_type != HASH_PARTITION || !list_of_part_fields)
|
|
|
|
{
|
2008-12-02 11:18:01 +01:00
|
|
|
DBUG_ASSERT(part_expr);
|
2006-09-26 08:30:40 +02:00
|
|
|
err= part_expr->walk(&Item::check_partition_func_processor, 0,
|
|
|
|
NULL);
|
|
|
|
if (!err && is_sub_partitioned() && !list_of_subpart_fields)
|
|
|
|
err= subpart_expr->walk(&Item::check_partition_func_processor, 0,
|
|
|
|
NULL);
|
2006-06-23 07:21:26 +02:00
|
|
|
}
|
2006-09-26 08:30:40 +02:00
|
|
|
if (err)
|
2006-06-23 07:21:26 +02:00
|
|
|
{
|
|
|
|
my_error(ER_PARTITION_FUNCTION_IS_NOT_ALLOWED, MYF(0));
|
|
|
|
goto end;
|
|
|
|
}
|
2006-04-05 12:39:06 +02:00
|
|
|
}
|
2006-03-31 19:39:44 +02:00
|
|
|
if (unlikely(!is_sub_partitioned() &&
|
|
|
|
!(use_default_subpartitions && use_default_no_subpartitions)))
|
|
|
|
{
|
|
|
|
my_error(ER_SUBPARTITION_ERROR, MYF(0));
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
if (unlikely(is_sub_partitioned() &&
|
|
|
|
(!(part_type == RANGE_PARTITION ||
|
|
|
|
part_type == LIST_PARTITION))))
|
|
|
|
{
|
|
|
|
/* Only RANGE and LIST partitioning can be subpartitioned */
|
|
|
|
my_error(ER_SUBPARTITION_ERROR, MYF(0));
|
|
|
|
goto end;
|
|
|
|
}
|
2006-06-27 22:19:27 +02:00
|
|
|
if (unlikely(set_up_defaults_for_partitioning(file, info, (uint)0)))
|
2006-03-31 19:39:44 +02:00
|
|
|
goto end;
|
2007-03-27 15:39:11 +02:00
|
|
|
if (!(tot_partitions= get_tot_partitions()))
|
|
|
|
{
|
|
|
|
my_error(ER_PARTITION_NOT_DEFINED_ERROR, MYF(0), "partitions");
|
|
|
|
goto end;
|
|
|
|
}
|
2006-03-31 19:39:44 +02:00
|
|
|
if (unlikely(tot_partitions > MAX_PARTITIONS))
|
|
|
|
{
|
|
|
|
my_error(ER_TOO_MANY_PARTITIONS_ERROR, MYF(0));
|
|
|
|
goto end;
|
|
|
|
}
|
2008-01-09 13:15:50 +01:00
|
|
|
/*
|
|
|
|
if NOT specified ENGINE = <engine>:
|
|
|
|
If Create, always use create_info->db_type
|
|
|
|
else, use previous tables db_type
|
|
|
|
either ALL or NONE partition should be set to
|
|
|
|
default_engine_type when not table_engine_set
|
|
|
|
Note: after a table is created its storage engines for
|
|
|
|
the table and all partitions/subpartitions are set.
|
|
|
|
So when ALTER it is already set on table level
|
|
|
|
*/
|
2008-02-25 21:18:50 +01:00
|
|
|
if (info && info->used_fields & HA_CREATE_USED_ENGINE)
|
2008-01-09 13:15:50 +01:00
|
|
|
{
|
|
|
|
table_engine_set= TRUE;
|
2008-02-25 21:18:50 +01:00
|
|
|
table_engine= info->db_type;
|
|
|
|
/* if partition_hton, use thd->lex->create_info */
|
|
|
|
if (table_engine == partition_hton)
|
|
|
|
table_engine= thd->lex->create_info.db_type;
|
|
|
|
DBUG_ASSERT(table_engine != partition_hton);
|
|
|
|
DBUG_PRINT("info", ("Using table_engine = %s",
|
|
|
|
ha_resolve_storage_engine_name(table_engine)));
|
2008-01-09 13:15:50 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
table_engine_set= FALSE;
|
|
|
|
if (thd->lex->sql_command != SQLCOM_CREATE_TABLE)
|
|
|
|
{
|
|
|
|
table_engine_set= TRUE;
|
2008-02-25 21:18:50 +01:00
|
|
|
DBUG_PRINT("info", ("No create, table_engine = %s",
|
|
|
|
ha_resolve_storage_engine_name(table_engine)));
|
2008-01-09 13:15:50 +01:00
|
|
|
DBUG_ASSERT(table_engine && table_engine != partition_hton);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-03-31 19:39:44 +02:00
|
|
|
if ((same_name= has_unique_names()))
|
|
|
|
{
|
|
|
|
my_error(ER_SAME_NAME_PARTITION, MYF(0), same_name);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
i= 0;
|
|
|
|
{
|
|
|
|
List_iterator<partition_element> part_it(partitions);
|
2008-01-09 13:15:50 +01:00
|
|
|
uint no_parts_not_set= 0;
|
|
|
|
uint prev_no_subparts_not_set= no_subparts + 1;
|
2006-03-31 19:39:44 +02:00
|
|
|
do
|
|
|
|
{
|
|
|
|
partition_element *part_elem= part_it++;
|
2008-01-04 12:06:20 +01:00
|
|
|
#ifdef HAVE_READLINK
|
|
|
|
if (!my_use_symdir || (thd->variables.sql_mode & MODE_NO_DIR_IN_CREATE))
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
if (part_elem->data_file_name)
|
2008-10-06 22:36:15 +02:00
|
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
|
|
|
WARN_OPTION_IGNORED, ER(WARN_OPTION_IGNORED),
|
|
|
|
"DATA DIRECTORY");
|
2008-01-04 12:06:20 +01:00
|
|
|
if (part_elem->index_file_name)
|
2008-10-06 22:36:15 +02:00
|
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
2008-10-08 00:14:58 +02:00
|
|
|
WARN_OPTION_IGNORED, ER(WARN_OPTION_IGNORED),
|
2008-10-06 22:36:15 +02:00
|
|
|
"INDEX DIRECTORY");
|
2008-01-04 12:06:20 +01:00
|
|
|
part_elem->data_file_name= part_elem->index_file_name= NULL;
|
|
|
|
}
|
2006-03-31 19:39:44 +02:00
|
|
|
if (!is_sub_partitioned())
|
|
|
|
{
|
2008-02-25 21:18:50 +01:00
|
|
|
if (part_elem->engine_type == NULL)
|
|
|
|
{
|
|
|
|
no_parts_not_set++;
|
|
|
|
part_elem->engine_type= default_engine_type;
|
|
|
|
}
|
2006-04-10 19:48:58 +02:00
|
|
|
if (check_table_name(part_elem->partition_name,
|
|
|
|
strlen(part_elem->partition_name)))
|
|
|
|
{
|
|
|
|
my_error(ER_WRONG_PARTITION_NAME, MYF(0));
|
|
|
|
goto end;
|
|
|
|
}
|
2008-02-25 21:18:50 +01:00
|
|
|
DBUG_PRINT("info", ("part = %d engine = %s",
|
|
|
|
i, ha_resolve_storage_engine_name(part_elem->engine_type)));
|
2006-03-31 19:39:44 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
uint j= 0;
|
2008-01-09 13:15:50 +01:00
|
|
|
uint no_subparts_not_set= 0;
|
2006-03-31 19:39:44 +02:00
|
|
|
List_iterator<partition_element> sub_it(part_elem->subpartitions);
|
2008-02-25 21:18:50 +01:00
|
|
|
partition_element *sub_elem;
|
2006-03-31 19:39:44 +02:00
|
|
|
do
|
|
|
|
{
|
2008-02-25 21:18:50 +01:00
|
|
|
sub_elem= sub_it++;
|
2006-04-20 20:11:54 +02:00
|
|
|
if (check_table_name(sub_elem->partition_name,
|
|
|
|
strlen(sub_elem->partition_name)))
|
2006-04-10 19:48:58 +02:00
|
|
|
{
|
|
|
|
my_error(ER_WRONG_PARTITION_NAME, MYF(0));
|
|
|
|
goto end;
|
|
|
|
}
|
2006-04-20 20:11:54 +02:00
|
|
|
if (sub_elem->engine_type == NULL)
|
2008-01-09 13:15:50 +01:00
|
|
|
{
|
2008-02-25 21:18:50 +01:00
|
|
|
if (part_elem->engine_type != NULL)
|
|
|
|
sub_elem->engine_type= part_elem->engine_type;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
sub_elem->engine_type= default_engine_type;
|
|
|
|
no_subparts_not_set++;
|
|
|
|
}
|
2008-01-09 13:15:50 +01:00
|
|
|
}
|
2008-02-25 21:18:50 +01:00
|
|
|
DBUG_PRINT("info", ("part = %d sub = %d engine = %s", i, j,
|
|
|
|
ha_resolve_storage_engine_name(sub_elem->engine_type)));
|
2006-03-31 19:39:44 +02:00
|
|
|
} while (++j < no_subparts);
|
2008-02-25 21:18:50 +01:00
|
|
|
|
|
|
|
if (prev_no_subparts_not_set == (no_subparts + 1) &&
|
|
|
|
(no_subparts_not_set == 0 || no_subparts_not_set == no_subparts))
|
2008-01-09 13:15:50 +01:00
|
|
|
prev_no_subparts_not_set= no_subparts_not_set;
|
2008-02-25 21:18:50 +01:00
|
|
|
|
2008-01-09 13:15:50 +01:00
|
|
|
if (!table_engine_set &&
|
2008-02-25 21:18:50 +01:00
|
|
|
prev_no_subparts_not_set != no_subparts_not_set)
|
2008-01-09 13:15:50 +01:00
|
|
|
{
|
|
|
|
DBUG_PRINT("info", ("no_subparts_not_set = %u no_subparts = %u",
|
|
|
|
no_subparts_not_set, no_subparts));
|
|
|
|
my_error(ER_MIX_HANDLER_ERROR, MYF(0));
|
|
|
|
goto end;
|
|
|
|
}
|
2008-02-25 21:18:50 +01:00
|
|
|
|
|
|
|
if (part_elem->engine_type == NULL)
|
|
|
|
{
|
|
|
|
if (no_subparts_not_set == 0)
|
|
|
|
part_elem->engine_type= sub_elem->engine_type;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
no_parts_not_set++;
|
|
|
|
part_elem->engine_type= default_engine_type;
|
|
|
|
}
|
|
|
|
}
|
2006-03-31 19:39:44 +02:00
|
|
|
}
|
|
|
|
} while (++i < no_parts);
|
2008-01-09 13:15:50 +01:00
|
|
|
if (!table_engine_set &&
|
|
|
|
no_parts_not_set != 0 &&
|
|
|
|
no_parts_not_set != no_parts)
|
|
|
|
{
|
|
|
|
DBUG_PRINT("info", ("no_parts_not_set = %u no_parts = %u",
|
|
|
|
no_parts_not_set, no_subparts));
|
|
|
|
my_error(ER_MIX_HANDLER_ERROR, MYF(0));
|
|
|
|
goto end;
|
|
|
|
}
|
2006-03-31 19:39:44 +02:00
|
|
|
}
|
2008-01-09 13:15:50 +01:00
|
|
|
if (unlikely(check_engine_mix(table_engine, table_engine_set)))
|
|
|
|
{
|
|
|
|
my_error(ER_MIX_HANDLER_ERROR, MYF(0));
|
2006-03-31 19:39:44 +02:00
|
|
|
goto end;
|
2008-01-09 13:15:50 +01:00
|
|
|
}
|
2006-03-31 19:39:44 +02:00
|
|
|
|
2008-02-25 21:18:50 +01:00
|
|
|
DBUG_ASSERT(table_engine != partition_hton &&
|
|
|
|
default_engine_type == table_engine);
|
2006-03-31 19:39:44 +02:00
|
|
|
if (eng_type)
|
2008-01-09 13:15:50 +01:00
|
|
|
*eng_type= table_engine;
|
|
|
|
|
2006-03-31 19:39:44 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
We need to check all constant expressions that they are of the correct
|
|
|
|
type and that they are increasing for ranges and not overlapping for
|
|
|
|
list constants.
|
|
|
|
*/
|
|
|
|
|
2006-04-18 04:51:34 +02:00
|
|
|
if (fixed)
|
|
|
|
{
|
|
|
|
if (unlikely((part_type == RANGE_PARTITION && check_range_constants()) ||
|
|
|
|
(part_type == LIST_PARTITION && check_list_constants())))
|
|
|
|
goto end;
|
|
|
|
}
|
2006-03-31 19:39:44 +02:00
|
|
|
result= FALSE;
|
|
|
|
end:
|
|
|
|
DBUG_RETURN(result);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-06-15 01:40:06 +02:00
|
|
|
/*
|
|
|
|
Print error for no partition found
|
2006-09-30 23:38:15 +02:00
|
|
|
|
2006-06-15 01:40:06 +02:00
|
|
|
SYNOPSIS
|
|
|
|
print_no_partition_found()
|
|
|
|
table Table object
|
2006-09-30 23:38:15 +02:00
|
|
|
|
2006-06-15 01:40:06 +02:00
|
|
|
RETURN VALUES
|
|
|
|
*/
|
|
|
|
|
|
|
|
void partition_info::print_no_partition_found(TABLE *table)
|
|
|
|
{
|
|
|
|
char buf[100];
|
|
|
|
char *buf_ptr= (char*)&buf;
|
2007-04-04 11:01:47 +02:00
|
|
|
TABLE_LIST table_list;
|
2006-06-15 01:40:06 +02:00
|
|
|
|
2007-04-04 11:01:47 +02:00
|
|
|
bzero(&table_list, sizeof(table_list));
|
|
|
|
table_list.db= table->s->db.str;
|
|
|
|
table_list.table_name= table->s->table_name.str;
|
|
|
|
|
|
|
|
if (check_single_table_access(current_thd,
|
|
|
|
SELECT_ACL, &table_list, TRUE))
|
|
|
|
my_message(ER_NO_PARTITION_FOR_GIVEN_VALUE,
|
|
|
|
ER(ER_NO_PARTITION_FOR_GIVEN_VALUE_SILENT), MYF(0));
|
2006-06-15 01:40:06 +02:00
|
|
|
else
|
2007-04-04 11:01:47 +02:00
|
|
|
{
|
|
|
|
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
|
|
|
|
if (part_expr->null_value)
|
|
|
|
buf_ptr= (char*)"NULL";
|
|
|
|
else
|
|
|
|
longlong2str(err_value, buf,
|
|
|
|
part_expr->unsigned_flag ? 10 : -10);
|
|
|
|
my_error(ER_NO_PARTITION_FOR_GIVEN_VALUE, MYF(0), buf_ptr);
|
|
|
|
dbug_tmp_restore_column_map(table->read_set, old_map);
|
|
|
|
}
|
2006-06-15 01:40:06 +02:00
|
|
|
}
|
2006-09-26 22:30:39 +02:00
|
|
|
/*
|
|
|
|
Set up buffers and arrays for fields requiring preparation
|
|
|
|
SYNOPSIS
|
|
|
|
set_up_charset_field_preps()
|
2006-09-30 23:38:15 +02:00
|
|
|
|
2006-09-26 22:30:39 +02:00
|
|
|
RETURN VALUES
|
|
|
|
TRUE Memory Allocation error
|
|
|
|
FALSE Success
|
2006-06-15 01:40:06 +02:00
|
|
|
|
2006-09-26 22:30:39 +02:00
|
|
|
DESCRIPTION
|
|
|
|
Set up arrays and buffers for fields that require special care for
|
|
|
|
calculation of partition id. This is used for string fields with
|
|
|
|
variable length or string fields with fixed length that isn't using
|
|
|
|
the binary collation.
|
|
|
|
*/
|
2006-06-15 01:40:06 +02:00
|
|
|
|
2006-09-26 22:30:39 +02:00
|
|
|
bool partition_info::set_up_charset_field_preps()
|
|
|
|
{
|
|
|
|
Field *field, **ptr;
|
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 **char_ptrs;
|
2006-09-26 22:30:39 +02:00
|
|
|
unsigned i;
|
|
|
|
size_t size;
|
|
|
|
uint tot_fields= 0;
|
|
|
|
uint tot_part_fields= 0;
|
|
|
|
uint tot_subpart_fields= 0;
|
|
|
|
DBUG_ENTER("set_up_charset_field_preps");
|
|
|
|
|
|
|
|
if (!(part_type == HASH_PARTITION &&
|
|
|
|
list_of_part_fields) &&
|
|
|
|
check_part_func_fields(part_field_array, FALSE))
|
|
|
|
{
|
|
|
|
ptr= part_field_array;
|
|
|
|
/* Set up arrays and buffers for those fields */
|
|
|
|
while ((field= *(ptr++)))
|
|
|
|
{
|
|
|
|
if (field_is_partition_charset(field))
|
|
|
|
{
|
|
|
|
tot_part_fields++;
|
|
|
|
tot_fields++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
size= tot_part_fields * sizeof(char*);
|
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 (!(char_ptrs= (uchar**)sql_calloc(size)))
|
2006-09-26 22:30:39 +02:00
|
|
|
goto error;
|
|
|
|
part_field_buffers= char_ptrs;
|
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 (!(char_ptrs= (uchar**)sql_calloc(size)))
|
2006-09-26 22:30:39 +02:00
|
|
|
goto error;
|
|
|
|
restore_part_field_ptrs= char_ptrs;
|
|
|
|
size= (tot_part_fields + 1) * sizeof(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
|
|
|
if (!(char_ptrs= (uchar**)sql_alloc(size)))
|
2006-09-26 22:30:39 +02:00
|
|
|
goto error;
|
|
|
|
part_charset_field_array= (Field**)char_ptrs;
|
|
|
|
ptr= part_field_array;
|
|
|
|
i= 0;
|
|
|
|
while ((field= *(ptr++)))
|
|
|
|
{
|
|
|
|
if (field_is_partition_charset(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
|
|
|
uchar *field_buf;
|
2006-09-26 22:30:39 +02:00
|
|
|
size= field->pack_length();
|
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= (uchar*) sql_calloc(size)))
|
2006-09-26 22:30:39 +02:00
|
|
|
goto error;
|
|
|
|
part_charset_field_array[i]= field;
|
|
|
|
part_field_buffers[i++]= field_buf;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
part_charset_field_array[i]= NULL;
|
|
|
|
}
|
2007-04-04 16:26:32 +02:00
|
|
|
if (is_sub_partitioned() && !list_of_subpart_fields &&
|
2006-09-26 22:30:39 +02:00
|
|
|
check_part_func_fields(subpart_field_array, FALSE))
|
|
|
|
{
|
|
|
|
/* Set up arrays and buffers for those fields */
|
|
|
|
ptr= subpart_field_array;
|
|
|
|
while ((field= *(ptr++)))
|
|
|
|
{
|
|
|
|
if (field_is_partition_charset(field))
|
2007-04-04 16:26:32 +02:00
|
|
|
{
|
2006-09-26 22:30:39 +02:00
|
|
|
tot_subpart_fields++;
|
2007-04-04 16:26:32 +02:00
|
|
|
tot_fields++;
|
|
|
|
}
|
2006-09-26 22:30:39 +02:00
|
|
|
}
|
|
|
|
size= tot_subpart_fields * sizeof(char*);
|
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 (!(char_ptrs= (uchar**) sql_calloc(size)))
|
2006-09-26 22:30:39 +02:00
|
|
|
goto error;
|
|
|
|
subpart_field_buffers= char_ptrs;
|
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 (!(char_ptrs= (uchar**) sql_calloc(size)))
|
2006-09-26 22:30:39 +02:00
|
|
|
goto error;
|
|
|
|
restore_subpart_field_ptrs= char_ptrs;
|
|
|
|
size= (tot_subpart_fields + 1) * sizeof(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
|
|
|
if (!(char_ptrs= (uchar**) sql_alloc(size)))
|
2006-09-26 22:30:39 +02:00
|
|
|
goto error;
|
|
|
|
subpart_charset_field_array= (Field**)char_ptrs;
|
2007-04-20 18:35:16 +02:00
|
|
|
ptr= subpart_field_array;
|
2006-09-26 22:30:39 +02:00
|
|
|
i= 0;
|
|
|
|
while ((field= *(ptr++)))
|
|
|
|
{
|
|
|
|
CHARSET_INFO *cs;
|
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 *field_buf;
|
2006-11-01 18:41:09 +01:00
|
|
|
LINT_INIT(field_buf);
|
2006-09-26 22:30:39 +02:00
|
|
|
|
|
|
|
if (!field_is_partition_charset(field))
|
|
|
|
continue;
|
|
|
|
cs= ((Field_str*)field)->charset();
|
|
|
|
size= field->pack_length();
|
2007-06-13 16:03:18 +02:00
|
|
|
if (!(field_buf= (uchar*) sql_calloc(size)))
|
2007-04-04 16:26:32 +02:00
|
|
|
goto error;
|
|
|
|
subpart_charset_field_array[i]= field;
|
2006-09-26 22:30:39 +02:00
|
|
|
subpart_field_buffers[i++]= field_buf;
|
|
|
|
}
|
2007-04-04 16:26:32 +02:00
|
|
|
subpart_charset_field_array[i]= NULL;
|
2006-09-26 22:30:39 +02:00
|
|
|
}
|
|
|
|
if (tot_fields)
|
|
|
|
{
|
2007-04-04 16:26:32 +02:00
|
|
|
uint k;
|
2006-09-26 22:30:39 +02:00
|
|
|
size= tot_fields*sizeof(char**);
|
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 (!(char_ptrs= (uchar**)sql_calloc(size)))
|
2006-09-26 22:30:39 +02:00
|
|
|
goto error;
|
|
|
|
full_part_field_buffers= char_ptrs;
|
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 (!(char_ptrs= (uchar**)sql_calloc(size)))
|
2006-09-26 22:30:39 +02:00
|
|
|
goto error;
|
|
|
|
restore_full_part_field_ptrs= char_ptrs;
|
|
|
|
size= (tot_fields + 1) * sizeof(char**);
|
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 (!(char_ptrs= (uchar**)sql_calloc(size)))
|
2006-09-26 22:30:39 +02:00
|
|
|
goto error;
|
|
|
|
full_part_charset_field_array= (Field**)char_ptrs;
|
|
|
|
for (i= 0; i < tot_part_fields; i++)
|
|
|
|
{
|
|
|
|
full_part_charset_field_array[i]= part_charset_field_array[i];
|
|
|
|
full_part_field_buffers[i]= part_field_buffers[i];
|
|
|
|
}
|
|
|
|
k= tot_part_fields;
|
|
|
|
for (i= 0; i < tot_subpart_fields; i++)
|
|
|
|
{
|
2007-04-04 16:26:32 +02:00
|
|
|
uint j;
|
|
|
|
bool found= FALSE;
|
2006-09-26 22:30:39 +02:00
|
|
|
field= subpart_charset_field_array[i];
|
2007-04-04 16:26:32 +02:00
|
|
|
|
2006-09-26 22:30:39 +02:00
|
|
|
for (j= 0; j < tot_part_fields; j++)
|
|
|
|
{
|
|
|
|
if (field == part_charset_field_array[i])
|
|
|
|
found= TRUE;
|
|
|
|
}
|
|
|
|
if (!found)
|
|
|
|
{
|
2007-04-04 16:26:32 +02:00
|
|
|
full_part_charset_field_array[k]= subpart_charset_field_array[i];
|
|
|
|
full_part_field_buffers[k]= subpart_field_buffers[i];
|
|
|
|
k++;
|
2006-09-26 22:30:39 +02:00
|
|
|
}
|
|
|
|
}
|
2007-04-04 16:26:32 +02:00
|
|
|
full_part_charset_field_array[k]= NULL;
|
2006-09-26 22:30:39 +02:00
|
|
|
}
|
|
|
|
DBUG_RETURN(FALSE);
|
|
|
|
error:
|
|
|
|
mem_alloc_error(size);
|
|
|
|
DBUG_RETURN(TRUE);
|
|
|
|
}
|
2008-02-28 13:46:52 +01:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Check if path does not contain mysql data home directory
|
|
|
|
for partition elements with data directory and index directory
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
check_partition_dirs()
|
|
|
|
part_info partition_info struct
|
|
|
|
|
|
|
|
RETURN VALUES
|
|
|
|
0 ok
|
|
|
|
1 error
|
|
|
|
*/
|
|
|
|
|
|
|
|
bool check_partition_dirs(partition_info *part_info)
|
|
|
|
{
|
|
|
|
if (!part_info)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
partition_element *part_elem;
|
|
|
|
List_iterator<partition_element> part_it(part_info->partitions);
|
|
|
|
while ((part_elem= part_it++))
|
|
|
|
{
|
|
|
|
if (part_elem->subpartitions.elements)
|
|
|
|
{
|
|
|
|
List_iterator<partition_element> sub_it(part_elem->subpartitions);
|
|
|
|
partition_element *subpart_elem;
|
|
|
|
while ((subpart_elem= sub_it++))
|
|
|
|
{
|
|
|
|
if (test_if_data_home_dir(subpart_elem->data_file_name))
|
|
|
|
goto dd_err;
|
|
|
|
if (test_if_data_home_dir(subpart_elem->index_file_name))
|
|
|
|
goto id_err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (test_if_data_home_dir(part_elem->data_file_name))
|
|
|
|
goto dd_err;
|
|
|
|
if (test_if_data_home_dir(part_elem->index_file_name))
|
|
|
|
goto id_err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
dd_err:
|
2008-03-17 16:11:26 +01:00
|
|
|
my_error(ER_WRONG_ARGUMENTS,MYF(0),"DATA DIRECTORY");
|
2008-02-28 13:46:52 +01:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
id_err:
|
2008-03-17 16:11:26 +01:00
|
|
|
my_error(ER_WRONG_ARGUMENTS,MYF(0),"INDEX DIRECTORY");
|
2008-02-28 13:46:52 +01:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-02-16 17:38:33 +01:00
|
|
|
#endif /* WITH_PARTITION_STORAGE_ENGINE */
|