2010-01-07 06:42:07 +01:00
|
|
|
/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
|
2001-12-06 13:10:51 +01:00
|
|
|
|
2000-07-31 21:29:14 +02: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-23 20:17:15 +01:00
|
|
|
the Free Software Foundation; version 2 of the License.
|
2001-12-06 13:10:51 +01:00
|
|
|
|
2000-07-31 21:29:14 +02: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.
|
2001-12-06 13:10:51 +01:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
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 */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Copy data from a textfile to table */
|
2009-10-12 08:22:53 +02:00
|
|
|
/* 2006-12 Erik Wetterberg : LOAD XML added */
|
|
|
|
|
|
2010-03-31 16:05:33 +02:00
|
|
|
#include "sql_priv.h"
|
|
|
|
|
#include "unireg.h"
|
|
|
|
|
#include "sql_load.h"
|
|
|
|
|
#include "sql_load.h"
|
|
|
|
|
#include "sql_cache.h" // query_cache_*
|
|
|
|
|
#include "sql_base.h" // fill_record_n_invoke_before_triggers
|
2000-07-31 21:29:14 +02:00
|
|
|
#include <my_dir.h>
|
2010-03-31 16:05:33 +02:00
|
|
|
#include "sql_view.h" // check_key_in_view
|
|
|
|
|
#include "sql_insert.h" // check_that_all_fields_are_given_values,
|
|
|
|
|
// prepare_triggers_for_insert_stmt,
|
|
|
|
|
// write_record
|
|
|
|
|
#include "sql_acl.h" // INSERT_ACL, UPDATE_ACL
|
|
|
|
|
#include "log_event.h" // Delete_file_log_event,
|
|
|
|
|
// Execute_load_query_log_event,
|
|
|
|
|
// LOG_EVENT_UPDATE_TABLE_MAP_VERSION_F
|
2000-07-31 21:29:14 +02:00
|
|
|
#include <m_ctype.h>
|
2009-02-21 10:36:07 +01:00
|
|
|
#include "rpl_mi.h"
|
2001-08-03 23:57:53 +02:00
|
|
|
#include "sql_repl.h"
|
2005-05-24 20:19:33 +02:00
|
|
|
#include "sp_head.h"
|
|
|
|
|
#include "sql_trigger.h"
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2009-10-12 08:22:53 +02:00
|
|
|
class XML_TAG {
|
|
|
|
|
public:
|
|
|
|
|
int level;
|
|
|
|
|
String field;
|
|
|
|
|
String value;
|
|
|
|
|
XML_TAG(int l, String f, String v);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
XML_TAG::XML_TAG(int l, String f, String v)
|
|
|
|
|
{
|
|
|
|
|
level= l;
|
|
|
|
|
field.append(f);
|
|
|
|
|
value.append(v);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
class READ_INFO {
|
|
|
|
|
File file;
|
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 *buffer, /* Buffer for read text */
|
2000-07-31 21:29:14 +02:00
|
|
|
*end_of_buff; /* Data in bufferts ends here */
|
|
|
|
|
uint buff_length, /* Length of buffert */
|
|
|
|
|
max_length; /* Max length of row */
|
|
|
|
|
char *field_term_ptr,*line_term_ptr,*line_start_ptr,*line_start_end;
|
|
|
|
|
uint field_term_length,line_term_length,enclosed_length;
|
|
|
|
|
int field_term_char,line_term_char,enclosed_char,escape_char;
|
|
|
|
|
int *stack,*stack_pos;
|
|
|
|
|
bool found_end_of_line,start_of_line,eof;
|
2001-08-03 23:57:53 +02:00
|
|
|
bool need_end_io_cache;
|
2000-07-31 21:29:14 +02:00
|
|
|
IO_CACHE cache;
|
|
|
|
|
NET *io_net;
|
2009-10-12 08:22:53 +02:00
|
|
|
int level; /* for load xml */
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
|
public:
|
|
|
|
|
bool error,line_cuted,found_null,enclosed;
|
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 *row_start, /* Found row starts here */
|
2000-07-31 21:29:14 +02:00
|
|
|
*row_end; /* Found row ends here */
|
2003-03-07 09:55:55 +01:00
|
|
|
CHARSET_INFO *read_charset;
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2003-03-07 09:55:55 +01:00
|
|
|
READ_INFO(File file,uint tot_length,CHARSET_INFO *cs,
|
2000-07-31 21:29:14 +02:00
|
|
|
String &field_term,String &line_start,String &line_term,
|
2000-09-25 23:33:25 +02:00
|
|
|
String &enclosed,int escape,bool get_it_from_net, bool is_fifo);
|
2000-07-31 21:29:14 +02:00
|
|
|
~READ_INFO();
|
|
|
|
|
int read_field();
|
|
|
|
|
int read_fixed_length(void);
|
|
|
|
|
int next_line(void);
|
|
|
|
|
char unescape(char chr);
|
|
|
|
|
int terminator(char *ptr,uint length);
|
|
|
|
|
bool find_start_of_fields();
|
2009-10-12 08:22:53 +02:00
|
|
|
/* load xml */
|
|
|
|
|
List<XML_TAG> taglist;
|
|
|
|
|
int read_value(int delim, String *val);
|
|
|
|
|
int read_xml();
|
|
|
|
|
int clear_level(int level);
|
|
|
|
|
|
2002-07-23 17:31:22 +02:00
|
|
|
/*
|
|
|
|
|
We need to force cache close before destructor is invoked to log
|
|
|
|
|
the last read block
|
|
|
|
|
*/
|
2001-08-03 23:57:53 +02:00
|
|
|
void end_io_cache()
|
|
|
|
|
{
|
|
|
|
|
::end_io_cache(&cache);
|
|
|
|
|
need_end_io_cache = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2002-07-23 17:31:22 +02:00
|
|
|
/*
|
|
|
|
|
Either this method, or we need to make cache public
|
|
|
|
|
Arg must be set from mysql_load() since constructor does not see
|
|
|
|
|
either the table or THD value
|
|
|
|
|
*/
|
2001-08-03 23:57:53 +02:00
|
|
|
void set_io_cache_arg(void* arg) { cache.arg = arg; }
|
2000-07-31 21:29:14 +02:00
|
|
|
};
|
|
|
|
|
|
2004-10-21 20:53:27 +02:00
|
|
|
static int read_fixed_length(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
|
2005-03-16 02:32:47 +01:00
|
|
|
List<Item> &fields_vars, List<Item> &set_fields,
|
|
|
|
|
List<Item> &set_values, READ_INFO &read_info,
|
2004-10-21 20:53:27 +02:00
|
|
|
ulong skip_lines,
|
|
|
|
|
bool ignore_check_option_errors);
|
|
|
|
|
static int read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
|
2005-03-16 02:32:47 +01:00
|
|
|
List<Item> &fields_vars, List<Item> &set_fields,
|
|
|
|
|
List<Item> &set_values, READ_INFO &read_info,
|
2004-10-21 20:53:27 +02:00
|
|
|
String &enclosed, ulong skip_lines,
|
|
|
|
|
bool ignore_check_option_errors);
|
2009-10-12 08:22:53 +02:00
|
|
|
|
|
|
|
|
static int read_xml_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
|
|
|
|
|
List<Item> &fields_vars, List<Item> &set_fields,
|
|
|
|
|
List<Item> &set_values, READ_INFO &read_info,
|
|
|
|
|
String &enclosed, ulong skip_lines,
|
|
|
|
|
bool ignore_check_option_errors);
|
|
|
|
|
|
2006-12-14 23:51:37 +01:00
|
|
|
#ifndef EMBEDDED_LIBRARY
|
2009-09-28 14:41:10 +02:00
|
|
|
static bool write_execute_load_query_log_event(THD *thd, sql_exchange* ex,
|
2009-10-27 16:15:53 +01:00
|
|
|
const char* db_arg, /* table's database */
|
2009-09-28 14:41:10 +02:00
|
|
|
const char* table_name_arg,
|
|
|
|
|
enum enum_duplicates duplicates,
|
|
|
|
|
bool ignore,
|
|
|
|
|
bool transactional_table,
|
|
|
|
|
int errocode);
|
2006-12-14 23:51:37 +01:00
|
|
|
#endif /* EMBEDDED_LIBRARY */
|
2005-03-16 02:32:47 +01:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Execute LOAD DATA query
|
|
|
|
|
|
|
|
|
|
SYNOPSYS
|
|
|
|
|
mysql_load()
|
|
|
|
|
thd - current thread
|
|
|
|
|
ex - sql_exchange object representing source file and its parsing rules
|
|
|
|
|
table_list - list of tables to which we are loading data
|
|
|
|
|
fields_vars - list of fields and variables to which we read
|
|
|
|
|
data from file
|
|
|
|
|
set_fields - list of fields mentioned in set clause
|
|
|
|
|
set_values - expressions to assign to fields in previous list
|
|
|
|
|
handle_duplicates - indicates whenever we should emit error or
|
|
|
|
|
replace row if we will meet duplicates.
|
|
|
|
|
ignore - - indicates whenever we should ignore duplicates
|
|
|
|
|
read_file_from_client - is this LOAD DATA LOCAL ?
|
|
|
|
|
|
|
|
|
|
RETURN VALUES
|
|
|
|
|
TRUE - error / FALSE - success
|
|
|
|
|
*/
|
|
|
|
|
|
2008-03-21 16:23:17 +01:00
|
|
|
int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
|
2005-03-16 02:32:47 +01:00
|
|
|
List<Item> &fields_vars, List<Item> &set_fields,
|
|
|
|
|
List<Item> &set_values,
|
|
|
|
|
enum enum_duplicates handle_duplicates, bool ignore,
|
2005-03-16 10:13:35 +01:00
|
|
|
bool read_file_from_client)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
|
char name[FN_REFLEN];
|
|
|
|
|
File file;
|
2006-06-02 22:21:32 +02:00
|
|
|
TABLE *table= NULL;
|
2010-02-04 21:15:47 +01:00
|
|
|
int error= 0;
|
2003-12-14 05:39:52 +01:00
|
|
|
String *field_term=ex->field_term,*escaped=ex->escaped;
|
|
|
|
|
String *enclosed=ex->enclosed;
|
2000-09-25 23:33:25 +02:00
|
|
|
bool is_fifo=0;
|
2003-09-06 15:50:30 +02:00
|
|
|
#ifndef EMBEDDED_LIBRARY
|
2001-08-03 23:57:53 +02:00
|
|
|
LOAD_FILE_INFO lf_info;
|
2003-09-06 15:50:30 +02:00
|
|
|
#endif
|
2003-02-26 23:06:09 +01:00
|
|
|
char *db = table_list->db; // This is never null
|
2004-02-16 17:58:21 +01:00
|
|
|
/*
|
|
|
|
|
If path for file is not defined, we will use the current database.
|
|
|
|
|
If this is not set, we will use the directory where the table to be
|
|
|
|
|
loaded is located
|
|
|
|
|
*/
|
2004-02-16 08:41:13 +01:00
|
|
|
char *tdb= thd->db ? thd->db : db; // Result is never null
|
2003-12-14 05:39:52 +01:00
|
|
|
ulong skip_lines= ex->skip_lines;
|
2005-01-27 22:38:56 +01:00
|
|
|
bool transactional_table;
|
2007-10-29 14:20:59 +01:00
|
|
|
THD::killed_state killed_status= THD::NOT_KILLED;
|
2000-07-31 21:29:14 +02:00
|
|
|
DBUG_ENTER("mysql_load");
|
|
|
|
|
|
2002-07-23 17:31:22 +02:00
|
|
|
#ifdef EMBEDDED_LIBRARY
|
|
|
|
|
read_file_from_client = 0; //server is always in the same process
|
|
|
|
|
#endif
|
|
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
if (escaped->length() > 1 || enclosed->length() > 1)
|
|
|
|
|
{
|
|
|
|
|
my_message(ER_WRONG_FIELD_TERMINATORS,ER(ER_WRONG_FIELD_TERMINATORS),
|
|
|
|
|
MYF(0));
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(TRUE);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2009-07-31 19:14:52 +02:00
|
|
|
|
|
|
|
|
/* Report problems with non-ascii separators */
|
|
|
|
|
if (!escaped->is_ascii() || !enclosed->is_ascii() ||
|
|
|
|
|
!field_term->is_ascii() ||
|
|
|
|
|
!ex->line_term->is_ascii() || !ex->line_start->is_ascii())
|
|
|
|
|
{
|
|
|
|
|
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
|
|
|
|
WARN_NON_ASCII_SEPARATOR_NOT_IMPLEMENTED,
|
|
|
|
|
ER(WARN_NON_ASCII_SEPARATOR_NOT_IMPLEMENTED));
|
|
|
|
|
}
|
|
|
|
|
|
2010-02-24 18:04:00 +01:00
|
|
|
if (open_and_lock_tables(thd, table_list, TRUE, 0))
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(TRUE);
|
2006-05-26 10:47:53 +02:00
|
|
|
if (setup_tables_and_check_access(thd, &thd->lex->select_lex.context,
|
|
|
|
|
&thd->lex->select_lex.top_join_list,
|
2006-06-04 20:05:22 +02:00
|
|
|
table_list,
|
2006-05-26 10:47:53 +02:00
|
|
|
&thd->lex->select_lex.leaf_tables, FALSE,
|
2006-08-15 19:45:24 +02:00
|
|
|
INSERT_ACL | UPDATE_ACL,
|
2006-05-26 10:47:53 +02:00
|
|
|
INSERT_ACL | UPDATE_ACL))
|
2004-10-21 20:53:27 +02:00
|
|
|
DBUG_RETURN(-1);
|
2004-11-21 18:33:49 +01:00
|
|
|
if (!table_list->table || // do not suport join view
|
|
|
|
|
!table_list->updatable || // and derived tables
|
|
|
|
|
check_key_in_view(thd, table_list))
|
2004-07-16 00:15:55 +02:00
|
|
|
{
|
2004-11-13 18:35:51 +01:00
|
|
|
my_error(ER_NON_UPDATABLE_TABLE, MYF(0), table_list->alias, "LOAD");
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(TRUE);
|
2004-07-16 00:15:55 +02:00
|
|
|
}
|
2005-07-01 06:05:42 +02:00
|
|
|
if (table_list->prepare_where(thd, 0, TRUE) ||
|
|
|
|
|
table_list->prepare_check_option(thd))
|
|
|
|
|
{
|
|
|
|
|
DBUG_RETURN(TRUE);
|
|
|
|
|
}
|
2005-03-16 02:32:47 +01:00
|
|
|
/*
|
|
|
|
|
Let us emit an error if we are loading data to table which is used
|
|
|
|
|
in subselect in SET clause like we do it for INSERT.
|
|
|
|
|
|
|
|
|
|
The main thing to fix to remove this restriction is to ensure that the
|
|
|
|
|
table is marked to be 'used for insert' in which case we should never
|
2005-05-02 15:45:33 +02:00
|
|
|
mark this table as 'const table' (ie, one that has only one row).
|
2005-03-16 02:32:47 +01:00
|
|
|
*/
|
2007-03-01 22:09:22 +01:00
|
|
|
if (unique_table(thd, table_list, table_list->next_global, 0))
|
2005-03-16 02:32:47 +01:00
|
|
|
{
|
|
|
|
|
my_error(ER_UPDATE_TABLE_USED, MYF(0), table_list->table_name);
|
|
|
|
|
DBUG_RETURN(TRUE);
|
|
|
|
|
}
|
|
|
|
|
|
2004-07-16 00:15:55 +02:00
|
|
|
table= table_list->table;
|
2002-11-07 03:02:37 +01:00
|
|
|
transactional_table= table->file->has_transactions();
|
|
|
|
|
|
2005-03-16 02:32:47 +01:00
|
|
|
if (!fields_vars.elements)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
|
Field **field;
|
|
|
|
|
for (field=table->field; *field ; field++)
|
2005-03-16 02:32:47 +01:00
|
|
|
fields_vars.push_back(new Item_field(*field));
|
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
Changes that requires code changes in other code of other storage engines.
(Note that all changes are very straightforward and one should find all issues
by compiling a --debug build and fixing all compiler errors and all
asserts in field.cc while running the test suite),
- New optional handler function introduced: reset()
This is called after every DML statement to make it easy for a handler to
statement specific cleanups.
(The only case it's not called is if force the file to be closed)
- handler::extra(HA_EXTRA_RESET) is removed. Code that was there before
should be moved to handler::reset()
- table->read_set contains a bitmap over all columns that are needed
in the query. read_row() and similar functions only needs to read these
columns
- table->write_set contains a bitmap over all columns that will be updated
in the query. write_row() and update_row() only needs to update these
columns.
The above bitmaps should now be up to date in all context
(including ALTER TABLE, filesort()).
The handler is informed of any changes to the bitmap after
fix_fields() by calling the virtual function
handler::column_bitmaps_signal(). If the handler does caching of
these bitmaps (instead of using table->read_set, table->write_set),
it should redo the caching in this code. as the signal() may be sent
several times, it's probably best to set a variable in the signal
and redo the caching on read_row() / write_row() if the variable was
set.
- Removed the read_set and write_set bitmap objects from the handler class
- Removed all column bit handling functions from the handler class.
(Now one instead uses the normal bitmap functions in my_bitmap.c instead
of handler dedicated bitmap functions)
- field->query_id is removed. One should instead instead check
table->read_set and table->write_set if a field is used in the query.
- handler::extra(HA_EXTRA_RETRIVE_ALL_COLS) and
handler::extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) are removed. One should now
instead use table->read_set to check for which columns to retrieve.
- If a handler needs to call Field->val() or Field->store() on columns
that are not used in the query, one should install a temporary
all-columns-used map while doing so. For this, we provide the following
functions:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
field->val();
dbug_tmp_restore_column_map(table->read_set, old_map);
and similar for the write map:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
field->val();
dbug_tmp_restore_column_map(table->write_set, old_map);
If this is not done, you will sooner or later hit a DBUG_ASSERT
in the field store() / val() functions.
(For not DBUG binaries, the dbug_tmp_restore_column_map() and
dbug_tmp_restore_column_map() are inline dummy functions and should
be optimized away be the compiler).
- If one needs to temporary set the column map for all binaries (and not
just to avoid the DBUG_ASSERT() in the Field::store() / Field::val()
methods) one should use the functions tmp_use_all_columns() and
tmp_restore_column_map() instead of the above dbug_ variants.
- All 'status' fields in the handler base class (like records,
data_file_length etc) are now stored in a 'stats' struct. This makes
it easier to know what status variables are provided by the base
handler. This requires some trivial variable names in the extra()
function.
- New virtual function handler::records(). This is called to optimize
COUNT(*) if (handler::table_flags() & HA_HAS_RECORDS()) is true.
(stats.records is not supposed to be an exact value. It's only has to
be 'reasonable enough' for the optimizer to be able to choose a good
optimization path).
- Non virtual handler::init() function added for caching of virtual
constants from engine.
- Removed has_transactions() virtual method. Now one should instead return
HA_NO_TRANSACTIONS in table_flags() if the table handler DOES NOT support
transactions.
- The 'xxxx_create_handler()' function now has a MEM_ROOT_root argument
that is to be used with 'new handler_name()' to allocate the handler
in the right area. The xxxx_create_handler() function is also
responsible for any initialization of the object before returning.
For example, one should change:
static handler *myisam_create_handler(TABLE_SHARE *table)
{
return new ha_myisam(table);
}
->
static handler *myisam_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
{
return new (mem_root) ha_myisam(table);
}
- New optional virtual function: use_hidden_primary_key().
This is called in case of an update/delete when
(table_flags() and HA_PRIMARY_KEY_REQUIRED_FOR_DELETE) is defined
but we don't have a primary key. This allows the handler to take precisions
in remembering any hidden primary key to able to update/delete any
found row. The default handler marks all columns to be read.
- handler::table_flags() now returns a ulonglong (to allow for more flags).
- New/changed table_flags()
- HA_HAS_RECORDS Set if ::records() is supported
- HA_NO_TRANSACTIONS Set if engine doesn't support transactions
- HA_PRIMARY_KEY_REQUIRED_FOR_DELETE
Set if we should mark all primary key columns for
read when reading rows as part of a DELETE
statement. If there is no primary key,
all columns are marked for read.
- HA_PARTIAL_COLUMN_READ Set if engine will not read all columns in some
cases (based on table->read_set)
- HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS
Renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
- HA_DUPP_POS Renamed to HA_DUPLICATE_POS
- HA_REQUIRES_KEY_COLUMNS_FOR_DELETE
Set this if we should mark ALL key columns for
read when when reading rows as part of a DELETE
statement. In case of an update we will mark
all keys for read for which key part changed
value.
- HA_STATS_RECORDS_IS_EXACT
Set this if stats.records is exact.
(This saves us some extra records() calls
when optimizing COUNT(*))
- Removed table_flags()
- HA_NOT_EXACT_COUNT Now one should instead use HA_HAS_RECORDS if
handler::records() gives an exact count() and
HA_STATS_RECORDS_IS_EXACT if stats.records is exact.
- HA_READ_RND_SAME Removed (no one supported this one)
- Removed not needed functions ha_retrieve_all_cols() and ha_retrieve_all_pk()
- Renamed handler::dupp_pos to handler::dup_pos
- Removed not used variable handler::sortkey
Upper level handler changes:
- ha_reset() now does some overall checks and calls ::reset()
- ha_table_flags() added. This is a cached version of table_flags(). The
cache is updated on engine creation time and updated on open.
MySQL level changes (not obvious from the above):
- DBUG_ASSERT() added to check that column usage matches what is set
in the column usage bit maps. (This found a LOT of bugs in current
column marking code).
- In 5.1 before, all used columns was marked in read_set and only updated
columns was marked in write_set. Now we only mark columns for which we
need a value in read_set.
- Column bitmaps are created in open_binary_frm() and open_table_from_share().
(Before this was in table.cc)
- handler::table_flags() calls are replaced with handler::ha_table_flags()
- For calling field->val() you must have the corresponding bit set in
table->read_set. For calling field->store() you must have the
corresponding bit set in table->write_set. (There are asserts in
all store()/val() functions to catch wrong usage)
- thd->set_query_id is renamed to thd->mark_used_columns and instead
of setting this to an integer value, this has now the values:
MARK_COLUMNS_NONE, MARK_COLUMNS_READ, MARK_COLUMNS_WRITE
Changed also all variables named 'set_query_id' to mark_used_columns.
- In filesort() we now inform the handler of exactly which columns are needed
doing the sort and choosing the rows.
- The TABLE_SHARE object has a 'all_set' column bitmap one can use
when one needs a column bitmap with all columns set.
(This is used for table->use_all_columns() and other places)
- The TABLE object has 3 column bitmaps:
- def_read_set Default bitmap for columns to be read
- def_write_set Default bitmap for columns to be written
- tmp_set Can be used as a temporary bitmap when needed.
The table object has also two pointer to bitmaps read_set and write_set
that the handler should use to find out which columns are used in which way.
- count() optimization now calls handler::records() instead of using
handler->stats.records (if (table_flags() & HA_HAS_RECORDS) is true).
- Added extra argument to Item::walk() to indicate if we should also
traverse sub queries.
- Added TABLE parameter to cp_buffer_from_ref()
- Don't close tables created with CREATE ... SELECT but keep them in
the table cache. (Faster usage of newly created tables).
New interfaces:
- table->clear_column_bitmaps() to initialize the bitmaps for tables
at start of new statements.
- table->column_bitmaps_set() to set up new column bitmaps and signal
the handler about this.
- table->column_bitmaps_set_no_signal() for some few cases where we need
to setup new column bitmaps but don't signal the handler (as the handler
has already been signaled about these before). Used for the momement
only in opt_range.cc when doing ROR scans.
- table->use_all_columns() to install a bitmap where all columns are marked
as use in the read and the write set.
- table->default_column_bitmaps() to install the normal read and write
column bitmaps, but not signaling the handler about this.
This is mainly used when creating TABLE instances.
- table->mark_columns_needed_for_delete(),
table->mark_columns_needed_for_delete() and
table->mark_columns_needed_for_insert() to allow us to put additional
columns in column usage maps if handler so requires.
(The handler indicates what it neads in handler->table_flags())
- table->prepare_for_position() to allow us to tell handler that it
needs to read primary key parts to be able to store them in
future table->position() calls.
(This replaces the table->file->ha_retrieve_all_pk function)
- table->mark_auto_increment_column() to tell handler are going to update
columns part of any auto_increment key.
- table->mark_columns_used_by_index() to mark all columns that is part of
an index. It will also send extra(HA_EXTRA_KEYREAD) to handler to allow
it to quickly know that it only needs to read colums that are part
of the key. (The handler can also use the column map for detecting this,
but simpler/faster handler can just monitor the extra() call).
- table->mark_columns_used_by_index_no_reset() to in addition to other columns,
also mark all columns that is used by the given key.
- table->restore_column_maps_after_mark_index() to restore to default
column maps after a call to table->mark_columns_used_by_index().
- New item function register_field_in_read_map(), for marking used columns
in table->read_map. Used by filesort() to mark all used columns
- Maintain in TABLE->merge_keys set of all keys that are used in query.
(Simplices some optimization loops)
- Maintain Field->part_of_key_not_clustered which is like Field->part_of_key
but the field in the clustered key is not assumed to be part of all index.
(used in opt_range.cc for faster loops)
- dbug_tmp_use_all_columns(), dbug_tmp_restore_column_map()
tmp_use_all_columns() and tmp_restore_column_map() functions to temporally
mark all columns as usable. The 'dbug_' version is primarily intended
inside a handler when it wants to just call Field:store() & Field::val()
functions, but don't need the column maps set for any other usage.
(ie:: bitmap_is_set() is never called)
- We can't use compare_records() to skip updates for handlers that returns
a partial column set and the read_set doesn't cover all columns in the
write set. The reason for this is that if we have a column marked only for
write we can't in the MySQL level know if the value changed or not.
The reason this worked before was that MySQL marked all to be written
columns as also to be read. The new 'optimal' bitmaps exposed this 'hidden
bug'.
- open_table_from_share() does not anymore setup temporary MEM_ROOT
object as a thread specific variable for the handler. Instead we
send the to-be-used MEMROOT to get_new_handler().
(Simpler, faster code)
Bugs fixed:
- Column marking was not done correctly in a lot of cases.
(ALTER TABLE, when using triggers, auto_increment fields etc)
(Could potentially result in wrong values inserted in table handlers
relying on that the old column maps or field->set_query_id was correct)
Especially when it comes to triggers, there may be cases where the
old code would cause lost/wrong values for NDB and/or InnoDB tables.
- Split thd->options flag OPTION_STATUS_NO_TRANS_UPDATE to two flags:
OPTION_STATUS_NO_TRANS_UPDATE and OPTION_KEEP_LOG.
This allowed me to remove some wrong warnings about:
"Some non-transactional changed tables couldn't be rolled back"
- Fixed handling of INSERT .. SELECT and CREATE ... SELECT that wrongly reset
(thd->options & OPTION_STATUS_NO_TRANS_UPDATE) which caused us to loose
some warnings about
"Some non-transactional changed tables couldn't be rolled back")
- Fixed use of uninitialized memory in ha_ndbcluster.cc::delete_table()
which could cause delete_table to report random failures.
- Fixed core dumps for some tests when running with --debug
- Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
(This has probably caused us to not properly remove temporary files after
crash)
- slow_logs was not properly initialized, which could maybe cause
extra/lost entries in slow log.
- If we get an duplicate row on insert, change column map to read and
write all columns while retrying the operation. This is required by
the definition of REPLACE and also ensures that fields that are only
part of UPDATE are properly handled. This fixed a bug in NDB and
REPLACE where REPLACE wrongly copied some column values from the replaced
row.
- For table handler that doesn't support NULL in keys, we would give an error
when creating a primary key with NULL fields, even after the fields has been
automaticly converted to NOT NULL.
- Creating a primary key on a SPATIAL key, would fail if field was not
declared as NOT NULL.
Cleanups:
- Removed not used condition argument to setup_tables
- Removed not needed item function reset_query_id_processor().
- Field->add_index is removed. Now this is instead maintained in
(field->flags & FIELD_IN_ADD_INDEX)
- Field->fieldnr is removed (use field->field_index instead)
- New argument to filesort() to indicate that it should return a set of
row pointers (not used columns). This allowed me to remove some references
to sql_command in filesort and should also enable us to return column
results in some cases where we couldn't before.
- Changed column bitmap handling in opt_range.cc to be aligned with TABLE
bitmap, which allowed me to use bitmap functions instead of looping over
all fields to create some needed bitmaps. (Faster and smaller code)
- Broke up found too long lines
- Moved some variable declaration at start of function for better code
readability.
- Removed some not used arguments from functions.
(setup_fields(), mysql_prepare_insert_check_table())
- setup_fields() now takes an enum instead of an int for marking columns
usage.
- For internal temporary tables, use handler::write_row(),
handler::delete_row() and handler::update_row() instead of
handler::ha_xxxx() for faster execution.
- Changed some constants to enum's and define's.
- Using separate column read and write sets allows for easier checking
of timestamp field was set by statement.
- Remove calls to free_io_cache() as this is now done automaticly in ha_reset()
- Don't build table->normalized_path as this is now identical to table->path
(after bar's fixes to convert filenames)
- Fixed some missed DBUG_PRINT(.."%lx") to use "0x%lx" to make it easier to
do comparision with the 'convert-dbug-for-diff' tool.
Things left to do in 5.1:
- We wrongly log failed CREATE TABLE ... SELECT in some cases when using
row based logging (as shown by testcase binlog_row_mix_innodb_myisam.result)
Mats has promised to look into this.
- Test that my fix for CREATE TABLE ... SELECT is indeed correct.
(I added several test cases for this, but in this case it's better that
someone else also tests this throughly).
Lars has promosed to do this.
2006-06-04 17:52:22 +02:00
|
|
|
bitmap_set_all(table->write_set);
|
2005-03-16 02:32:47 +01:00
|
|
|
table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET;
|
|
|
|
|
/*
|
|
|
|
|
Let us also prepare SET clause, altough it is probably empty
|
|
|
|
|
in this case.
|
|
|
|
|
*/
|
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
Changes that requires code changes in other code of other storage engines.
(Note that all changes are very straightforward and one should find all issues
by compiling a --debug build and fixing all compiler errors and all
asserts in field.cc while running the test suite),
- New optional handler function introduced: reset()
This is called after every DML statement to make it easy for a handler to
statement specific cleanups.
(The only case it's not called is if force the file to be closed)
- handler::extra(HA_EXTRA_RESET) is removed. Code that was there before
should be moved to handler::reset()
- table->read_set contains a bitmap over all columns that are needed
in the query. read_row() and similar functions only needs to read these
columns
- table->write_set contains a bitmap over all columns that will be updated
in the query. write_row() and update_row() only needs to update these
columns.
The above bitmaps should now be up to date in all context
(including ALTER TABLE, filesort()).
The handler is informed of any changes to the bitmap after
fix_fields() by calling the virtual function
handler::column_bitmaps_signal(). If the handler does caching of
these bitmaps (instead of using table->read_set, table->write_set),
it should redo the caching in this code. as the signal() may be sent
several times, it's probably best to set a variable in the signal
and redo the caching on read_row() / write_row() if the variable was
set.
- Removed the read_set and write_set bitmap objects from the handler class
- Removed all column bit handling functions from the handler class.
(Now one instead uses the normal bitmap functions in my_bitmap.c instead
of handler dedicated bitmap functions)
- field->query_id is removed. One should instead instead check
table->read_set and table->write_set if a field is used in the query.
- handler::extra(HA_EXTRA_RETRIVE_ALL_COLS) and
handler::extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) are removed. One should now
instead use table->read_set to check for which columns to retrieve.
- If a handler needs to call Field->val() or Field->store() on columns
that are not used in the query, one should install a temporary
all-columns-used map while doing so. For this, we provide the following
functions:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
field->val();
dbug_tmp_restore_column_map(table->read_set, old_map);
and similar for the write map:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
field->val();
dbug_tmp_restore_column_map(table->write_set, old_map);
If this is not done, you will sooner or later hit a DBUG_ASSERT
in the field store() / val() functions.
(For not DBUG binaries, the dbug_tmp_restore_column_map() and
dbug_tmp_restore_column_map() are inline dummy functions and should
be optimized away be the compiler).
- If one needs to temporary set the column map for all binaries (and not
just to avoid the DBUG_ASSERT() in the Field::store() / Field::val()
methods) one should use the functions tmp_use_all_columns() and
tmp_restore_column_map() instead of the above dbug_ variants.
- All 'status' fields in the handler base class (like records,
data_file_length etc) are now stored in a 'stats' struct. This makes
it easier to know what status variables are provided by the base
handler. This requires some trivial variable names in the extra()
function.
- New virtual function handler::records(). This is called to optimize
COUNT(*) if (handler::table_flags() & HA_HAS_RECORDS()) is true.
(stats.records is not supposed to be an exact value. It's only has to
be 'reasonable enough' for the optimizer to be able to choose a good
optimization path).
- Non virtual handler::init() function added for caching of virtual
constants from engine.
- Removed has_transactions() virtual method. Now one should instead return
HA_NO_TRANSACTIONS in table_flags() if the table handler DOES NOT support
transactions.
- The 'xxxx_create_handler()' function now has a MEM_ROOT_root argument
that is to be used with 'new handler_name()' to allocate the handler
in the right area. The xxxx_create_handler() function is also
responsible for any initialization of the object before returning.
For example, one should change:
static handler *myisam_create_handler(TABLE_SHARE *table)
{
return new ha_myisam(table);
}
->
static handler *myisam_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
{
return new (mem_root) ha_myisam(table);
}
- New optional virtual function: use_hidden_primary_key().
This is called in case of an update/delete when
(table_flags() and HA_PRIMARY_KEY_REQUIRED_FOR_DELETE) is defined
but we don't have a primary key. This allows the handler to take precisions
in remembering any hidden primary key to able to update/delete any
found row. The default handler marks all columns to be read.
- handler::table_flags() now returns a ulonglong (to allow for more flags).
- New/changed table_flags()
- HA_HAS_RECORDS Set if ::records() is supported
- HA_NO_TRANSACTIONS Set if engine doesn't support transactions
- HA_PRIMARY_KEY_REQUIRED_FOR_DELETE
Set if we should mark all primary key columns for
read when reading rows as part of a DELETE
statement. If there is no primary key,
all columns are marked for read.
- HA_PARTIAL_COLUMN_READ Set if engine will not read all columns in some
cases (based on table->read_set)
- HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS
Renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
- HA_DUPP_POS Renamed to HA_DUPLICATE_POS
- HA_REQUIRES_KEY_COLUMNS_FOR_DELETE
Set this if we should mark ALL key columns for
read when when reading rows as part of a DELETE
statement. In case of an update we will mark
all keys for read for which key part changed
value.
- HA_STATS_RECORDS_IS_EXACT
Set this if stats.records is exact.
(This saves us some extra records() calls
when optimizing COUNT(*))
- Removed table_flags()
- HA_NOT_EXACT_COUNT Now one should instead use HA_HAS_RECORDS if
handler::records() gives an exact count() and
HA_STATS_RECORDS_IS_EXACT if stats.records is exact.
- HA_READ_RND_SAME Removed (no one supported this one)
- Removed not needed functions ha_retrieve_all_cols() and ha_retrieve_all_pk()
- Renamed handler::dupp_pos to handler::dup_pos
- Removed not used variable handler::sortkey
Upper level handler changes:
- ha_reset() now does some overall checks and calls ::reset()
- ha_table_flags() added. This is a cached version of table_flags(). The
cache is updated on engine creation time and updated on open.
MySQL level changes (not obvious from the above):
- DBUG_ASSERT() added to check that column usage matches what is set
in the column usage bit maps. (This found a LOT of bugs in current
column marking code).
- In 5.1 before, all used columns was marked in read_set and only updated
columns was marked in write_set. Now we only mark columns for which we
need a value in read_set.
- Column bitmaps are created in open_binary_frm() and open_table_from_share().
(Before this was in table.cc)
- handler::table_flags() calls are replaced with handler::ha_table_flags()
- For calling field->val() you must have the corresponding bit set in
table->read_set. For calling field->store() you must have the
corresponding bit set in table->write_set. (There are asserts in
all store()/val() functions to catch wrong usage)
- thd->set_query_id is renamed to thd->mark_used_columns and instead
of setting this to an integer value, this has now the values:
MARK_COLUMNS_NONE, MARK_COLUMNS_READ, MARK_COLUMNS_WRITE
Changed also all variables named 'set_query_id' to mark_used_columns.
- In filesort() we now inform the handler of exactly which columns are needed
doing the sort and choosing the rows.
- The TABLE_SHARE object has a 'all_set' column bitmap one can use
when one needs a column bitmap with all columns set.
(This is used for table->use_all_columns() and other places)
- The TABLE object has 3 column bitmaps:
- def_read_set Default bitmap for columns to be read
- def_write_set Default bitmap for columns to be written
- tmp_set Can be used as a temporary bitmap when needed.
The table object has also two pointer to bitmaps read_set and write_set
that the handler should use to find out which columns are used in which way.
- count() optimization now calls handler::records() instead of using
handler->stats.records (if (table_flags() & HA_HAS_RECORDS) is true).
- Added extra argument to Item::walk() to indicate if we should also
traverse sub queries.
- Added TABLE parameter to cp_buffer_from_ref()
- Don't close tables created with CREATE ... SELECT but keep them in
the table cache. (Faster usage of newly created tables).
New interfaces:
- table->clear_column_bitmaps() to initialize the bitmaps for tables
at start of new statements.
- table->column_bitmaps_set() to set up new column bitmaps and signal
the handler about this.
- table->column_bitmaps_set_no_signal() for some few cases where we need
to setup new column bitmaps but don't signal the handler (as the handler
has already been signaled about these before). Used for the momement
only in opt_range.cc when doing ROR scans.
- table->use_all_columns() to install a bitmap where all columns are marked
as use in the read and the write set.
- table->default_column_bitmaps() to install the normal read and write
column bitmaps, but not signaling the handler about this.
This is mainly used when creating TABLE instances.
- table->mark_columns_needed_for_delete(),
table->mark_columns_needed_for_delete() and
table->mark_columns_needed_for_insert() to allow us to put additional
columns in column usage maps if handler so requires.
(The handler indicates what it neads in handler->table_flags())
- table->prepare_for_position() to allow us to tell handler that it
needs to read primary key parts to be able to store them in
future table->position() calls.
(This replaces the table->file->ha_retrieve_all_pk function)
- table->mark_auto_increment_column() to tell handler are going to update
columns part of any auto_increment key.
- table->mark_columns_used_by_index() to mark all columns that is part of
an index. It will also send extra(HA_EXTRA_KEYREAD) to handler to allow
it to quickly know that it only needs to read colums that are part
of the key. (The handler can also use the column map for detecting this,
but simpler/faster handler can just monitor the extra() call).
- table->mark_columns_used_by_index_no_reset() to in addition to other columns,
also mark all columns that is used by the given key.
- table->restore_column_maps_after_mark_index() to restore to default
column maps after a call to table->mark_columns_used_by_index().
- New item function register_field_in_read_map(), for marking used columns
in table->read_map. Used by filesort() to mark all used columns
- Maintain in TABLE->merge_keys set of all keys that are used in query.
(Simplices some optimization loops)
- Maintain Field->part_of_key_not_clustered which is like Field->part_of_key
but the field in the clustered key is not assumed to be part of all index.
(used in opt_range.cc for faster loops)
- dbug_tmp_use_all_columns(), dbug_tmp_restore_column_map()
tmp_use_all_columns() and tmp_restore_column_map() functions to temporally
mark all columns as usable. The 'dbug_' version is primarily intended
inside a handler when it wants to just call Field:store() & Field::val()
functions, but don't need the column maps set for any other usage.
(ie:: bitmap_is_set() is never called)
- We can't use compare_records() to skip updates for handlers that returns
a partial column set and the read_set doesn't cover all columns in the
write set. The reason for this is that if we have a column marked only for
write we can't in the MySQL level know if the value changed or not.
The reason this worked before was that MySQL marked all to be written
columns as also to be read. The new 'optimal' bitmaps exposed this 'hidden
bug'.
- open_table_from_share() does not anymore setup temporary MEM_ROOT
object as a thread specific variable for the handler. Instead we
send the to-be-used MEMROOT to get_new_handler().
(Simpler, faster code)
Bugs fixed:
- Column marking was not done correctly in a lot of cases.
(ALTER TABLE, when using triggers, auto_increment fields etc)
(Could potentially result in wrong values inserted in table handlers
relying on that the old column maps or field->set_query_id was correct)
Especially when it comes to triggers, there may be cases where the
old code would cause lost/wrong values for NDB and/or InnoDB tables.
- Split thd->options flag OPTION_STATUS_NO_TRANS_UPDATE to two flags:
OPTION_STATUS_NO_TRANS_UPDATE and OPTION_KEEP_LOG.
This allowed me to remove some wrong warnings about:
"Some non-transactional changed tables couldn't be rolled back"
- Fixed handling of INSERT .. SELECT and CREATE ... SELECT that wrongly reset
(thd->options & OPTION_STATUS_NO_TRANS_UPDATE) which caused us to loose
some warnings about
"Some non-transactional changed tables couldn't be rolled back")
- Fixed use of uninitialized memory in ha_ndbcluster.cc::delete_table()
which could cause delete_table to report random failures.
- Fixed core dumps for some tests when running with --debug
- Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
(This has probably caused us to not properly remove temporary files after
crash)
- slow_logs was not properly initialized, which could maybe cause
extra/lost entries in slow log.
- If we get an duplicate row on insert, change column map to read and
write all columns while retrying the operation. This is required by
the definition of REPLACE and also ensures that fields that are only
part of UPDATE are properly handled. This fixed a bug in NDB and
REPLACE where REPLACE wrongly copied some column values from the replaced
row.
- For table handler that doesn't support NULL in keys, we would give an error
when creating a primary key with NULL fields, even after the fields has been
automaticly converted to NOT NULL.
- Creating a primary key on a SPATIAL key, would fail if field was not
declared as NOT NULL.
Cleanups:
- Removed not used condition argument to setup_tables
- Removed not needed item function reset_query_id_processor().
- Field->add_index is removed. Now this is instead maintained in
(field->flags & FIELD_IN_ADD_INDEX)
- Field->fieldnr is removed (use field->field_index instead)
- New argument to filesort() to indicate that it should return a set of
row pointers (not used columns). This allowed me to remove some references
to sql_command in filesort and should also enable us to return column
results in some cases where we couldn't before.
- Changed column bitmap handling in opt_range.cc to be aligned with TABLE
bitmap, which allowed me to use bitmap functions instead of looping over
all fields to create some needed bitmaps. (Faster and smaller code)
- Broke up found too long lines
- Moved some variable declaration at start of function for better code
readability.
- Removed some not used arguments from functions.
(setup_fields(), mysql_prepare_insert_check_table())
- setup_fields() now takes an enum instead of an int for marking columns
usage.
- For internal temporary tables, use handler::write_row(),
handler::delete_row() and handler::update_row() instead of
handler::ha_xxxx() for faster execution.
- Changed some constants to enum's and define's.
- Using separate column read and write sets allows for easier checking
of timestamp field was set by statement.
- Remove calls to free_io_cache() as this is now done automaticly in ha_reset()
- Don't build table->normalized_path as this is now identical to table->path
(after bar's fixes to convert filenames)
- Fixed some missed DBUG_PRINT(.."%lx") to use "0x%lx" to make it easier to
do comparision with the 'convert-dbug-for-diff' tool.
Things left to do in 5.1:
- We wrongly log failed CREATE TABLE ... SELECT in some cases when using
row based logging (as shown by testcase binlog_row_mix_innodb_myisam.result)
Mats has promised to look into this.
- Test that my fix for CREATE TABLE ... SELECT is indeed correct.
(I added several test cases for this, but in this case it's better that
someone else also tests this throughly).
Lars has promosed to do this.
2006-06-04 17:52:22 +02:00
|
|
|
if (setup_fields(thd, 0, set_fields, MARK_COLUMNS_WRITE, 0, 0) ||
|
|
|
|
|
setup_fields(thd, 0, set_values, MARK_COLUMNS_READ, 0, 0))
|
2005-03-16 02:32:47 +01:00
|
|
|
DBUG_RETURN(TRUE);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{ // Part field list
|
2004-07-16 00:15:55 +02:00
|
|
|
/* TODO: use this conds for 'WITH CHECK OPTIONS' */
|
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
Changes that requires code changes in other code of other storage engines.
(Note that all changes are very straightforward and one should find all issues
by compiling a --debug build and fixing all compiler errors and all
asserts in field.cc while running the test suite),
- New optional handler function introduced: reset()
This is called after every DML statement to make it easy for a handler to
statement specific cleanups.
(The only case it's not called is if force the file to be closed)
- handler::extra(HA_EXTRA_RESET) is removed. Code that was there before
should be moved to handler::reset()
- table->read_set contains a bitmap over all columns that are needed
in the query. read_row() and similar functions only needs to read these
columns
- table->write_set contains a bitmap over all columns that will be updated
in the query. write_row() and update_row() only needs to update these
columns.
The above bitmaps should now be up to date in all context
(including ALTER TABLE, filesort()).
The handler is informed of any changes to the bitmap after
fix_fields() by calling the virtual function
handler::column_bitmaps_signal(). If the handler does caching of
these bitmaps (instead of using table->read_set, table->write_set),
it should redo the caching in this code. as the signal() may be sent
several times, it's probably best to set a variable in the signal
and redo the caching on read_row() / write_row() if the variable was
set.
- Removed the read_set and write_set bitmap objects from the handler class
- Removed all column bit handling functions from the handler class.
(Now one instead uses the normal bitmap functions in my_bitmap.c instead
of handler dedicated bitmap functions)
- field->query_id is removed. One should instead instead check
table->read_set and table->write_set if a field is used in the query.
- handler::extra(HA_EXTRA_RETRIVE_ALL_COLS) and
handler::extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) are removed. One should now
instead use table->read_set to check for which columns to retrieve.
- If a handler needs to call Field->val() or Field->store() on columns
that are not used in the query, one should install a temporary
all-columns-used map while doing so. For this, we provide the following
functions:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
field->val();
dbug_tmp_restore_column_map(table->read_set, old_map);
and similar for the write map:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
field->val();
dbug_tmp_restore_column_map(table->write_set, old_map);
If this is not done, you will sooner or later hit a DBUG_ASSERT
in the field store() / val() functions.
(For not DBUG binaries, the dbug_tmp_restore_column_map() and
dbug_tmp_restore_column_map() are inline dummy functions and should
be optimized away be the compiler).
- If one needs to temporary set the column map for all binaries (and not
just to avoid the DBUG_ASSERT() in the Field::store() / Field::val()
methods) one should use the functions tmp_use_all_columns() and
tmp_restore_column_map() instead of the above dbug_ variants.
- All 'status' fields in the handler base class (like records,
data_file_length etc) are now stored in a 'stats' struct. This makes
it easier to know what status variables are provided by the base
handler. This requires some trivial variable names in the extra()
function.
- New virtual function handler::records(). This is called to optimize
COUNT(*) if (handler::table_flags() & HA_HAS_RECORDS()) is true.
(stats.records is not supposed to be an exact value. It's only has to
be 'reasonable enough' for the optimizer to be able to choose a good
optimization path).
- Non virtual handler::init() function added for caching of virtual
constants from engine.
- Removed has_transactions() virtual method. Now one should instead return
HA_NO_TRANSACTIONS in table_flags() if the table handler DOES NOT support
transactions.
- The 'xxxx_create_handler()' function now has a MEM_ROOT_root argument
that is to be used with 'new handler_name()' to allocate the handler
in the right area. The xxxx_create_handler() function is also
responsible for any initialization of the object before returning.
For example, one should change:
static handler *myisam_create_handler(TABLE_SHARE *table)
{
return new ha_myisam(table);
}
->
static handler *myisam_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
{
return new (mem_root) ha_myisam(table);
}
- New optional virtual function: use_hidden_primary_key().
This is called in case of an update/delete when
(table_flags() and HA_PRIMARY_KEY_REQUIRED_FOR_DELETE) is defined
but we don't have a primary key. This allows the handler to take precisions
in remembering any hidden primary key to able to update/delete any
found row. The default handler marks all columns to be read.
- handler::table_flags() now returns a ulonglong (to allow for more flags).
- New/changed table_flags()
- HA_HAS_RECORDS Set if ::records() is supported
- HA_NO_TRANSACTIONS Set if engine doesn't support transactions
- HA_PRIMARY_KEY_REQUIRED_FOR_DELETE
Set if we should mark all primary key columns for
read when reading rows as part of a DELETE
statement. If there is no primary key,
all columns are marked for read.
- HA_PARTIAL_COLUMN_READ Set if engine will not read all columns in some
cases (based on table->read_set)
- HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS
Renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
- HA_DUPP_POS Renamed to HA_DUPLICATE_POS
- HA_REQUIRES_KEY_COLUMNS_FOR_DELETE
Set this if we should mark ALL key columns for
read when when reading rows as part of a DELETE
statement. In case of an update we will mark
all keys for read for which key part changed
value.
- HA_STATS_RECORDS_IS_EXACT
Set this if stats.records is exact.
(This saves us some extra records() calls
when optimizing COUNT(*))
- Removed table_flags()
- HA_NOT_EXACT_COUNT Now one should instead use HA_HAS_RECORDS if
handler::records() gives an exact count() and
HA_STATS_RECORDS_IS_EXACT if stats.records is exact.
- HA_READ_RND_SAME Removed (no one supported this one)
- Removed not needed functions ha_retrieve_all_cols() and ha_retrieve_all_pk()
- Renamed handler::dupp_pos to handler::dup_pos
- Removed not used variable handler::sortkey
Upper level handler changes:
- ha_reset() now does some overall checks and calls ::reset()
- ha_table_flags() added. This is a cached version of table_flags(). The
cache is updated on engine creation time and updated on open.
MySQL level changes (not obvious from the above):
- DBUG_ASSERT() added to check that column usage matches what is set
in the column usage bit maps. (This found a LOT of bugs in current
column marking code).
- In 5.1 before, all used columns was marked in read_set and only updated
columns was marked in write_set. Now we only mark columns for which we
need a value in read_set.
- Column bitmaps are created in open_binary_frm() and open_table_from_share().
(Before this was in table.cc)
- handler::table_flags() calls are replaced with handler::ha_table_flags()
- For calling field->val() you must have the corresponding bit set in
table->read_set. For calling field->store() you must have the
corresponding bit set in table->write_set. (There are asserts in
all store()/val() functions to catch wrong usage)
- thd->set_query_id is renamed to thd->mark_used_columns and instead
of setting this to an integer value, this has now the values:
MARK_COLUMNS_NONE, MARK_COLUMNS_READ, MARK_COLUMNS_WRITE
Changed also all variables named 'set_query_id' to mark_used_columns.
- In filesort() we now inform the handler of exactly which columns are needed
doing the sort and choosing the rows.
- The TABLE_SHARE object has a 'all_set' column bitmap one can use
when one needs a column bitmap with all columns set.
(This is used for table->use_all_columns() and other places)
- The TABLE object has 3 column bitmaps:
- def_read_set Default bitmap for columns to be read
- def_write_set Default bitmap for columns to be written
- tmp_set Can be used as a temporary bitmap when needed.
The table object has also two pointer to bitmaps read_set and write_set
that the handler should use to find out which columns are used in which way.
- count() optimization now calls handler::records() instead of using
handler->stats.records (if (table_flags() & HA_HAS_RECORDS) is true).
- Added extra argument to Item::walk() to indicate if we should also
traverse sub queries.
- Added TABLE parameter to cp_buffer_from_ref()
- Don't close tables created with CREATE ... SELECT but keep them in
the table cache. (Faster usage of newly created tables).
New interfaces:
- table->clear_column_bitmaps() to initialize the bitmaps for tables
at start of new statements.
- table->column_bitmaps_set() to set up new column bitmaps and signal
the handler about this.
- table->column_bitmaps_set_no_signal() for some few cases where we need
to setup new column bitmaps but don't signal the handler (as the handler
has already been signaled about these before). Used for the momement
only in opt_range.cc when doing ROR scans.
- table->use_all_columns() to install a bitmap where all columns are marked
as use in the read and the write set.
- table->default_column_bitmaps() to install the normal read and write
column bitmaps, but not signaling the handler about this.
This is mainly used when creating TABLE instances.
- table->mark_columns_needed_for_delete(),
table->mark_columns_needed_for_delete() and
table->mark_columns_needed_for_insert() to allow us to put additional
columns in column usage maps if handler so requires.
(The handler indicates what it neads in handler->table_flags())
- table->prepare_for_position() to allow us to tell handler that it
needs to read primary key parts to be able to store them in
future table->position() calls.
(This replaces the table->file->ha_retrieve_all_pk function)
- table->mark_auto_increment_column() to tell handler are going to update
columns part of any auto_increment key.
- table->mark_columns_used_by_index() to mark all columns that is part of
an index. It will also send extra(HA_EXTRA_KEYREAD) to handler to allow
it to quickly know that it only needs to read colums that are part
of the key. (The handler can also use the column map for detecting this,
but simpler/faster handler can just monitor the extra() call).
- table->mark_columns_used_by_index_no_reset() to in addition to other columns,
also mark all columns that is used by the given key.
- table->restore_column_maps_after_mark_index() to restore to default
column maps after a call to table->mark_columns_used_by_index().
- New item function register_field_in_read_map(), for marking used columns
in table->read_map. Used by filesort() to mark all used columns
- Maintain in TABLE->merge_keys set of all keys that are used in query.
(Simplices some optimization loops)
- Maintain Field->part_of_key_not_clustered which is like Field->part_of_key
but the field in the clustered key is not assumed to be part of all index.
(used in opt_range.cc for faster loops)
- dbug_tmp_use_all_columns(), dbug_tmp_restore_column_map()
tmp_use_all_columns() and tmp_restore_column_map() functions to temporally
mark all columns as usable. The 'dbug_' version is primarily intended
inside a handler when it wants to just call Field:store() & Field::val()
functions, but don't need the column maps set for any other usage.
(ie:: bitmap_is_set() is never called)
- We can't use compare_records() to skip updates for handlers that returns
a partial column set and the read_set doesn't cover all columns in the
write set. The reason for this is that if we have a column marked only for
write we can't in the MySQL level know if the value changed or not.
The reason this worked before was that MySQL marked all to be written
columns as also to be read. The new 'optimal' bitmaps exposed this 'hidden
bug'.
- open_table_from_share() does not anymore setup temporary MEM_ROOT
object as a thread specific variable for the handler. Instead we
send the to-be-used MEMROOT to get_new_handler().
(Simpler, faster code)
Bugs fixed:
- Column marking was not done correctly in a lot of cases.
(ALTER TABLE, when using triggers, auto_increment fields etc)
(Could potentially result in wrong values inserted in table handlers
relying on that the old column maps or field->set_query_id was correct)
Especially when it comes to triggers, there may be cases where the
old code would cause lost/wrong values for NDB and/or InnoDB tables.
- Split thd->options flag OPTION_STATUS_NO_TRANS_UPDATE to two flags:
OPTION_STATUS_NO_TRANS_UPDATE and OPTION_KEEP_LOG.
This allowed me to remove some wrong warnings about:
"Some non-transactional changed tables couldn't be rolled back"
- Fixed handling of INSERT .. SELECT and CREATE ... SELECT that wrongly reset
(thd->options & OPTION_STATUS_NO_TRANS_UPDATE) which caused us to loose
some warnings about
"Some non-transactional changed tables couldn't be rolled back")
- Fixed use of uninitialized memory in ha_ndbcluster.cc::delete_table()
which could cause delete_table to report random failures.
- Fixed core dumps for some tests when running with --debug
- Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
(This has probably caused us to not properly remove temporary files after
crash)
- slow_logs was not properly initialized, which could maybe cause
extra/lost entries in slow log.
- If we get an duplicate row on insert, change column map to read and
write all columns while retrying the operation. This is required by
the definition of REPLACE and also ensures that fields that are only
part of UPDATE are properly handled. This fixed a bug in NDB and
REPLACE where REPLACE wrongly copied some column values from the replaced
row.
- For table handler that doesn't support NULL in keys, we would give an error
when creating a primary key with NULL fields, even after the fields has been
automaticly converted to NOT NULL.
- Creating a primary key on a SPATIAL key, would fail if field was not
declared as NOT NULL.
Cleanups:
- Removed not used condition argument to setup_tables
- Removed not needed item function reset_query_id_processor().
- Field->add_index is removed. Now this is instead maintained in
(field->flags & FIELD_IN_ADD_INDEX)
- Field->fieldnr is removed (use field->field_index instead)
- New argument to filesort() to indicate that it should return a set of
row pointers (not used columns). This allowed me to remove some references
to sql_command in filesort and should also enable us to return column
results in some cases where we couldn't before.
- Changed column bitmap handling in opt_range.cc to be aligned with TABLE
bitmap, which allowed me to use bitmap functions instead of looping over
all fields to create some needed bitmaps. (Faster and smaller code)
- Broke up found too long lines
- Moved some variable declaration at start of function for better code
readability.
- Removed some not used arguments from functions.
(setup_fields(), mysql_prepare_insert_check_table())
- setup_fields() now takes an enum instead of an int for marking columns
usage.
- For internal temporary tables, use handler::write_row(),
handler::delete_row() and handler::update_row() instead of
handler::ha_xxxx() for faster execution.
- Changed some constants to enum's and define's.
- Using separate column read and write sets allows for easier checking
of timestamp field was set by statement.
- Remove calls to free_io_cache() as this is now done automaticly in ha_reset()
- Don't build table->normalized_path as this is now identical to table->path
(after bar's fixes to convert filenames)
- Fixed some missed DBUG_PRINT(.."%lx") to use "0x%lx" to make it easier to
do comparision with the 'convert-dbug-for-diff' tool.
Things left to do in 5.1:
- We wrongly log failed CREATE TABLE ... SELECT in some cases when using
row based logging (as shown by testcase binlog_row_mix_innodb_myisam.result)
Mats has promised to look into this.
- Test that my fix for CREATE TABLE ... SELECT is indeed correct.
(I added several test cases for this, but in this case it's better that
someone else also tests this throughly).
Lars has promosed to do this.
2006-06-04 17:52:22 +02:00
|
|
|
if (setup_fields(thd, 0, fields_vars, MARK_COLUMNS_WRITE, 0, 0) ||
|
|
|
|
|
setup_fields(thd, 0, set_fields, MARK_COLUMNS_WRITE, 0, 0) ||
|
2005-07-01 06:05:42 +02:00
|
|
|
check_that_all_fields_are_given_values(thd, table, table_list))
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(TRUE);
|
2005-03-16 02:32:47 +01:00
|
|
|
/*
|
|
|
|
|
Check whenever TIMESTAMP field with auto-set feature specified
|
|
|
|
|
explicitly.
|
|
|
|
|
*/
|
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
Changes that requires code changes in other code of other storage engines.
(Note that all changes are very straightforward and one should find all issues
by compiling a --debug build and fixing all compiler errors and all
asserts in field.cc while running the test suite),
- New optional handler function introduced: reset()
This is called after every DML statement to make it easy for a handler to
statement specific cleanups.
(The only case it's not called is if force the file to be closed)
- handler::extra(HA_EXTRA_RESET) is removed. Code that was there before
should be moved to handler::reset()
- table->read_set contains a bitmap over all columns that are needed
in the query. read_row() and similar functions only needs to read these
columns
- table->write_set contains a bitmap over all columns that will be updated
in the query. write_row() and update_row() only needs to update these
columns.
The above bitmaps should now be up to date in all context
(including ALTER TABLE, filesort()).
The handler is informed of any changes to the bitmap after
fix_fields() by calling the virtual function
handler::column_bitmaps_signal(). If the handler does caching of
these bitmaps (instead of using table->read_set, table->write_set),
it should redo the caching in this code. as the signal() may be sent
several times, it's probably best to set a variable in the signal
and redo the caching on read_row() / write_row() if the variable was
set.
- Removed the read_set and write_set bitmap objects from the handler class
- Removed all column bit handling functions from the handler class.
(Now one instead uses the normal bitmap functions in my_bitmap.c instead
of handler dedicated bitmap functions)
- field->query_id is removed. One should instead instead check
table->read_set and table->write_set if a field is used in the query.
- handler::extra(HA_EXTRA_RETRIVE_ALL_COLS) and
handler::extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) are removed. One should now
instead use table->read_set to check for which columns to retrieve.
- If a handler needs to call Field->val() or Field->store() on columns
that are not used in the query, one should install a temporary
all-columns-used map while doing so. For this, we provide the following
functions:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
field->val();
dbug_tmp_restore_column_map(table->read_set, old_map);
and similar for the write map:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
field->val();
dbug_tmp_restore_column_map(table->write_set, old_map);
If this is not done, you will sooner or later hit a DBUG_ASSERT
in the field store() / val() functions.
(For not DBUG binaries, the dbug_tmp_restore_column_map() and
dbug_tmp_restore_column_map() are inline dummy functions and should
be optimized away be the compiler).
- If one needs to temporary set the column map for all binaries (and not
just to avoid the DBUG_ASSERT() in the Field::store() / Field::val()
methods) one should use the functions tmp_use_all_columns() and
tmp_restore_column_map() instead of the above dbug_ variants.
- All 'status' fields in the handler base class (like records,
data_file_length etc) are now stored in a 'stats' struct. This makes
it easier to know what status variables are provided by the base
handler. This requires some trivial variable names in the extra()
function.
- New virtual function handler::records(). This is called to optimize
COUNT(*) if (handler::table_flags() & HA_HAS_RECORDS()) is true.
(stats.records is not supposed to be an exact value. It's only has to
be 'reasonable enough' for the optimizer to be able to choose a good
optimization path).
- Non virtual handler::init() function added for caching of virtual
constants from engine.
- Removed has_transactions() virtual method. Now one should instead return
HA_NO_TRANSACTIONS in table_flags() if the table handler DOES NOT support
transactions.
- The 'xxxx_create_handler()' function now has a MEM_ROOT_root argument
that is to be used with 'new handler_name()' to allocate the handler
in the right area. The xxxx_create_handler() function is also
responsible for any initialization of the object before returning.
For example, one should change:
static handler *myisam_create_handler(TABLE_SHARE *table)
{
return new ha_myisam(table);
}
->
static handler *myisam_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
{
return new (mem_root) ha_myisam(table);
}
- New optional virtual function: use_hidden_primary_key().
This is called in case of an update/delete when
(table_flags() and HA_PRIMARY_KEY_REQUIRED_FOR_DELETE) is defined
but we don't have a primary key. This allows the handler to take precisions
in remembering any hidden primary key to able to update/delete any
found row. The default handler marks all columns to be read.
- handler::table_flags() now returns a ulonglong (to allow for more flags).
- New/changed table_flags()
- HA_HAS_RECORDS Set if ::records() is supported
- HA_NO_TRANSACTIONS Set if engine doesn't support transactions
- HA_PRIMARY_KEY_REQUIRED_FOR_DELETE
Set if we should mark all primary key columns for
read when reading rows as part of a DELETE
statement. If there is no primary key,
all columns are marked for read.
- HA_PARTIAL_COLUMN_READ Set if engine will not read all columns in some
cases (based on table->read_set)
- HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS
Renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
- HA_DUPP_POS Renamed to HA_DUPLICATE_POS
- HA_REQUIRES_KEY_COLUMNS_FOR_DELETE
Set this if we should mark ALL key columns for
read when when reading rows as part of a DELETE
statement. In case of an update we will mark
all keys for read for which key part changed
value.
- HA_STATS_RECORDS_IS_EXACT
Set this if stats.records is exact.
(This saves us some extra records() calls
when optimizing COUNT(*))
- Removed table_flags()
- HA_NOT_EXACT_COUNT Now one should instead use HA_HAS_RECORDS if
handler::records() gives an exact count() and
HA_STATS_RECORDS_IS_EXACT if stats.records is exact.
- HA_READ_RND_SAME Removed (no one supported this one)
- Removed not needed functions ha_retrieve_all_cols() and ha_retrieve_all_pk()
- Renamed handler::dupp_pos to handler::dup_pos
- Removed not used variable handler::sortkey
Upper level handler changes:
- ha_reset() now does some overall checks and calls ::reset()
- ha_table_flags() added. This is a cached version of table_flags(). The
cache is updated on engine creation time and updated on open.
MySQL level changes (not obvious from the above):
- DBUG_ASSERT() added to check that column usage matches what is set
in the column usage bit maps. (This found a LOT of bugs in current
column marking code).
- In 5.1 before, all used columns was marked in read_set and only updated
columns was marked in write_set. Now we only mark columns for which we
need a value in read_set.
- Column bitmaps are created in open_binary_frm() and open_table_from_share().
(Before this was in table.cc)
- handler::table_flags() calls are replaced with handler::ha_table_flags()
- For calling field->val() you must have the corresponding bit set in
table->read_set. For calling field->store() you must have the
corresponding bit set in table->write_set. (There are asserts in
all store()/val() functions to catch wrong usage)
- thd->set_query_id is renamed to thd->mark_used_columns and instead
of setting this to an integer value, this has now the values:
MARK_COLUMNS_NONE, MARK_COLUMNS_READ, MARK_COLUMNS_WRITE
Changed also all variables named 'set_query_id' to mark_used_columns.
- In filesort() we now inform the handler of exactly which columns are needed
doing the sort and choosing the rows.
- The TABLE_SHARE object has a 'all_set' column bitmap one can use
when one needs a column bitmap with all columns set.
(This is used for table->use_all_columns() and other places)
- The TABLE object has 3 column bitmaps:
- def_read_set Default bitmap for columns to be read
- def_write_set Default bitmap for columns to be written
- tmp_set Can be used as a temporary bitmap when needed.
The table object has also two pointer to bitmaps read_set and write_set
that the handler should use to find out which columns are used in which way.
- count() optimization now calls handler::records() instead of using
handler->stats.records (if (table_flags() & HA_HAS_RECORDS) is true).
- Added extra argument to Item::walk() to indicate if we should also
traverse sub queries.
- Added TABLE parameter to cp_buffer_from_ref()
- Don't close tables created with CREATE ... SELECT but keep them in
the table cache. (Faster usage of newly created tables).
New interfaces:
- table->clear_column_bitmaps() to initialize the bitmaps for tables
at start of new statements.
- table->column_bitmaps_set() to set up new column bitmaps and signal
the handler about this.
- table->column_bitmaps_set_no_signal() for some few cases where we need
to setup new column bitmaps but don't signal the handler (as the handler
has already been signaled about these before). Used for the momement
only in opt_range.cc when doing ROR scans.
- table->use_all_columns() to install a bitmap where all columns are marked
as use in the read and the write set.
- table->default_column_bitmaps() to install the normal read and write
column bitmaps, but not signaling the handler about this.
This is mainly used when creating TABLE instances.
- table->mark_columns_needed_for_delete(),
table->mark_columns_needed_for_delete() and
table->mark_columns_needed_for_insert() to allow us to put additional
columns in column usage maps if handler so requires.
(The handler indicates what it neads in handler->table_flags())
- table->prepare_for_position() to allow us to tell handler that it
needs to read primary key parts to be able to store them in
future table->position() calls.
(This replaces the table->file->ha_retrieve_all_pk function)
- table->mark_auto_increment_column() to tell handler are going to update
columns part of any auto_increment key.
- table->mark_columns_used_by_index() to mark all columns that is part of
an index. It will also send extra(HA_EXTRA_KEYREAD) to handler to allow
it to quickly know that it only needs to read colums that are part
of the key. (The handler can also use the column map for detecting this,
but simpler/faster handler can just monitor the extra() call).
- table->mark_columns_used_by_index_no_reset() to in addition to other columns,
also mark all columns that is used by the given key.
- table->restore_column_maps_after_mark_index() to restore to default
column maps after a call to table->mark_columns_used_by_index().
- New item function register_field_in_read_map(), for marking used columns
in table->read_map. Used by filesort() to mark all used columns
- Maintain in TABLE->merge_keys set of all keys that are used in query.
(Simplices some optimization loops)
- Maintain Field->part_of_key_not_clustered which is like Field->part_of_key
but the field in the clustered key is not assumed to be part of all index.
(used in opt_range.cc for faster loops)
- dbug_tmp_use_all_columns(), dbug_tmp_restore_column_map()
tmp_use_all_columns() and tmp_restore_column_map() functions to temporally
mark all columns as usable. The 'dbug_' version is primarily intended
inside a handler when it wants to just call Field:store() & Field::val()
functions, but don't need the column maps set for any other usage.
(ie:: bitmap_is_set() is never called)
- We can't use compare_records() to skip updates for handlers that returns
a partial column set and the read_set doesn't cover all columns in the
write set. The reason for this is that if we have a column marked only for
write we can't in the MySQL level know if the value changed or not.
The reason this worked before was that MySQL marked all to be written
columns as also to be read. The new 'optimal' bitmaps exposed this 'hidden
bug'.
- open_table_from_share() does not anymore setup temporary MEM_ROOT
object as a thread specific variable for the handler. Instead we
send the to-be-used MEMROOT to get_new_handler().
(Simpler, faster code)
Bugs fixed:
- Column marking was not done correctly in a lot of cases.
(ALTER TABLE, when using triggers, auto_increment fields etc)
(Could potentially result in wrong values inserted in table handlers
relying on that the old column maps or field->set_query_id was correct)
Especially when it comes to triggers, there may be cases where the
old code would cause lost/wrong values for NDB and/or InnoDB tables.
- Split thd->options flag OPTION_STATUS_NO_TRANS_UPDATE to two flags:
OPTION_STATUS_NO_TRANS_UPDATE and OPTION_KEEP_LOG.
This allowed me to remove some wrong warnings about:
"Some non-transactional changed tables couldn't be rolled back"
- Fixed handling of INSERT .. SELECT and CREATE ... SELECT that wrongly reset
(thd->options & OPTION_STATUS_NO_TRANS_UPDATE) which caused us to loose
some warnings about
"Some non-transactional changed tables couldn't be rolled back")
- Fixed use of uninitialized memory in ha_ndbcluster.cc::delete_table()
which could cause delete_table to report random failures.
- Fixed core dumps for some tests when running with --debug
- Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
(This has probably caused us to not properly remove temporary files after
crash)
- slow_logs was not properly initialized, which could maybe cause
extra/lost entries in slow log.
- If we get an duplicate row on insert, change column map to read and
write all columns while retrying the operation. This is required by
the definition of REPLACE and also ensures that fields that are only
part of UPDATE are properly handled. This fixed a bug in NDB and
REPLACE where REPLACE wrongly copied some column values from the replaced
row.
- For table handler that doesn't support NULL in keys, we would give an error
when creating a primary key with NULL fields, even after the fields has been
automaticly converted to NOT NULL.
- Creating a primary key on a SPATIAL key, would fail if field was not
declared as NOT NULL.
Cleanups:
- Removed not used condition argument to setup_tables
- Removed not needed item function reset_query_id_processor().
- Field->add_index is removed. Now this is instead maintained in
(field->flags & FIELD_IN_ADD_INDEX)
- Field->fieldnr is removed (use field->field_index instead)
- New argument to filesort() to indicate that it should return a set of
row pointers (not used columns). This allowed me to remove some references
to sql_command in filesort and should also enable us to return column
results in some cases where we couldn't before.
- Changed column bitmap handling in opt_range.cc to be aligned with TABLE
bitmap, which allowed me to use bitmap functions instead of looping over
all fields to create some needed bitmaps. (Faster and smaller code)
- Broke up found too long lines
- Moved some variable declaration at start of function for better code
readability.
- Removed some not used arguments from functions.
(setup_fields(), mysql_prepare_insert_check_table())
- setup_fields() now takes an enum instead of an int for marking columns
usage.
- For internal temporary tables, use handler::write_row(),
handler::delete_row() and handler::update_row() instead of
handler::ha_xxxx() for faster execution.
- Changed some constants to enum's and define's.
- Using separate column read and write sets allows for easier checking
of timestamp field was set by statement.
- Remove calls to free_io_cache() as this is now done automaticly in ha_reset()
- Don't build table->normalized_path as this is now identical to table->path
(after bar's fixes to convert filenames)
- Fixed some missed DBUG_PRINT(.."%lx") to use "0x%lx" to make it easier to
do comparision with the 'convert-dbug-for-diff' tool.
Things left to do in 5.1:
- We wrongly log failed CREATE TABLE ... SELECT in some cases when using
row based logging (as shown by testcase binlog_row_mix_innodb_myisam.result)
Mats has promised to look into this.
- Test that my fix for CREATE TABLE ... SELECT is indeed correct.
(I added several test cases for this, but in this case it's better that
someone else also tests this throughly).
Lars has promosed to do this.
2006-06-04 17:52:22 +02:00
|
|
|
if (table->timestamp_field)
|
|
|
|
|
{
|
|
|
|
|
if (bitmap_is_set(table->write_set,
|
|
|
|
|
table->timestamp_field->field_index))
|
|
|
|
|
table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
bitmap_set_bit(table->write_set,
|
|
|
|
|
table->timestamp_field->field_index);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/* Fix the expressions in SET clause */
|
|
|
|
|
if (setup_fields(thd, 0, set_values, MARK_COLUMNS_READ, 0, 0))
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(TRUE);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
|
2007-04-04 16:58:25 +02:00
|
|
|
prepare_triggers_for_insert_stmt(table);
|
2006-07-01 23:51:10 +02:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
uint tot_length=0;
|
2005-03-16 02:32:47 +01:00
|
|
|
bool use_blobs= 0, use_vars= 0;
|
|
|
|
|
List_iterator_fast<Item> it(fields_vars);
|
|
|
|
|
Item *item;
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2005-03-16 02:32:47 +01:00
|
|
|
while ((item= it++))
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2008-03-28 16:59:13 +01:00
|
|
|
Item *real_item= item->real_item();
|
|
|
|
|
|
|
|
|
|
if (real_item->type() == Item::FIELD_ITEM)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2008-03-28 16:59:13 +01:00
|
|
|
Field *field= ((Item_field*)real_item)->field;
|
2005-03-16 02:32:47 +01:00
|
|
|
if (field->flags & BLOB_FLAG)
|
|
|
|
|
{
|
|
|
|
|
use_blobs= 1;
|
|
|
|
|
tot_length+= 256; // Will be extended if needed
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
tot_length+= field->field_length;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2008-03-28 16:59:13 +01:00
|
|
|
else if (item->type() == Item::STRING_ITEM)
|
2005-03-16 02:32:47 +01:00
|
|
|
use_vars= 1;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
if (use_blobs && !ex->line_term->length() && !field_term->length())
|
|
|
|
|
{
|
|
|
|
|
my_message(ER_BLOBS_AND_NO_TERMINATED,ER(ER_BLOBS_AND_NO_TERMINATED),
|
|
|
|
|
MYF(0));
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(TRUE);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2005-03-16 02:32:47 +01:00
|
|
|
if (use_vars && !field_term->length() && !enclosed->length())
|
|
|
|
|
{
|
|
|
|
|
my_error(ER_LOAD_FROM_FIXED_SIZE_ROWS_TO_VAR, MYF(0));
|
|
|
|
|
DBUG_RETURN(TRUE);
|
|
|
|
|
}
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
|
/* We can't give an error in the middle when using LOCAL files */
|
|
|
|
|
if (read_file_from_client && handle_duplicates == DUP_ERROR)
|
2004-12-31 11:04:35 +01:00
|
|
|
ignore= 1;
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2002-12-16 14:33:29 +01:00
|
|
|
#ifndef EMBEDDED_LIBRARY
|
2002-02-13 20:53:26 +01:00
|
|
|
if (read_file_from_client)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2002-02-07 23:29:46 +01:00
|
|
|
(void)net_request_file(&thd->net,ex->file_name);
|
2000-07-31 21:29:14 +02:00
|
|
|
file = -1;
|
|
|
|
|
}
|
|
|
|
|
else
|
2002-12-16 14:33:29 +01:00
|
|
|
#endif
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
|
#ifdef DONT_ALLOW_FULL_LOAD_DATA_PATHS
|
|
|
|
|
ex->file_name+=dirname_length(ex->file_name);
|
|
|
|
|
#endif
|
2004-09-07 08:55:34 +02:00
|
|
|
if (!dirname_length(ex->file_name))
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2005-11-23 21:45:02 +01:00
|
|
|
strxnmov(name, FN_REFLEN-1, mysql_real_data_home, tdb, NullS);
|
2004-09-07 14:28:26 +02:00
|
|
|
(void) fn_format(name, ex->file_name, name, "",
|
|
|
|
|
MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2004-09-07 14:28:26 +02:00
|
|
|
(void) fn_format(name, ex->file_name, mysql_real_data_home, "",
|
2009-11-28 05:43:16 +01:00
|
|
|
MY_RELATIVE_PATH | MY_UNPACK_FILENAME |
|
|
|
|
|
MY_RETURN_REAL_PATH);
|
2006-04-16 03:17:32 +02:00
|
|
|
#if !defined(__WIN__) && ! defined(__NETWARE__)
|
2000-07-31 21:29:14 +02:00
|
|
|
MY_STAT stat_info;
|
2010-01-07 06:42:07 +01:00
|
|
|
if (!mysql_file_stat(key_file_load, name, &stat_info, MYF(MY_WME)))
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(TRUE);
|
2001-12-06 13:10:51 +01:00
|
|
|
|
2001-08-03 23:57:53 +02:00
|
|
|
// if we are not in slave thread, the file must be:
|
|
|
|
|
if (!thd->slave_thread &&
|
|
|
|
|
!((stat_info.st_mode & S_IROTH) == S_IROTH && // readable by others
|
2000-09-25 23:33:25 +02:00
|
|
|
(stat_info.st_mode & S_IFLNK) != S_IFLNK && // and not a symlink
|
|
|
|
|
((stat_info.st_mode & S_IFREG) == S_IFREG ||
|
|
|
|
|
(stat_info.st_mode & S_IFIFO) == S_IFIFO)))
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2004-11-13 18:35:51 +01:00
|
|
|
my_error(ER_TEXTFILE_NOT_READABLE, MYF(0), name);
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(TRUE);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2000-09-25 23:33:25 +02:00
|
|
|
if ((stat_info.st_mode & S_IFIFO) == S_IFIFO)
|
|
|
|
|
is_fifo = 1;
|
2000-07-31 21:29:14 +02:00
|
|
|
#endif
|
2007-02-14 14:44:34 +01:00
|
|
|
|
2009-02-21 10:36:07 +01:00
|
|
|
if (thd->slave_thread)
|
|
|
|
|
{
|
|
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
|
|
|
|
if (strncmp(active_mi->rli.slave_patternload_file, name,
|
|
|
|
|
active_mi->rli.slave_patternload_file_size))
|
|
|
|
|
{
|
|
|
|
|
/*
|
|
|
|
|
LOAD DATA INFILE in the slave SQL Thread can only read from
|
|
|
|
|
--slave-load-tmpdir". This should never happen. Please, report a bug.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
sql_print_error("LOAD DATA INFILE in the slave SQL Thread can only read from --slave-load-tmpdir. " \
|
|
|
|
|
"Please, report a bug.");
|
|
|
|
|
my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--slave-load-tmpdir");
|
|
|
|
|
DBUG_RETURN(TRUE);
|
|
|
|
|
}
|
|
|
|
|
#else
|
|
|
|
|
/*
|
|
|
|
|
This is impossible and should never happen.
|
|
|
|
|
*/
|
|
|
|
|
DBUG_ASSERT(FALSE);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2009-11-28 05:43:16 +01:00
|
|
|
else if (opt_secure_file_priv)
|
2007-02-14 14:44:34 +01:00
|
|
|
{
|
2009-11-28 05:43:16 +01:00
|
|
|
char secure_file_real_path[FN_REFLEN];
|
|
|
|
|
(void) my_realpath(secure_file_real_path, opt_secure_file_priv, 0);
|
|
|
|
|
if (strncmp(secure_file_real_path, name, strlen(secure_file_real_path)))
|
|
|
|
|
{
|
|
|
|
|
/* Read only allowed from within dir specified by secure_file_priv */
|
|
|
|
|
my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--secure-file-priv");
|
|
|
|
|
DBUG_RETURN(TRUE);
|
|
|
|
|
}
|
2007-02-14 14:44:34 +01:00
|
|
|
}
|
|
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2010-01-07 06:42:07 +01:00
|
|
|
if ((file= mysql_file_open(key_file_load,
|
|
|
|
|
name, O_RDONLY, MYF(MY_WME))) < 0)
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(TRUE);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
COPY_INFO info;
|
|
|
|
|
bzero((char*) &info,sizeof(info));
|
2004-12-31 11:04:35 +01:00
|
|
|
info.ignore= ignore;
|
2000-07-31 21:29:14 +02:00
|
|
|
info.handle_duplicates=handle_duplicates;
|
2008-09-17 08:34:00 +02:00
|
|
|
info.escape_char= (escaped->length() && (ex->escaped_given() ||
|
|
|
|
|
!(thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES)))
|
|
|
|
|
? (*escaped)[0] : INT_MAX;
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2007-02-28 14:06:57 +01:00
|
|
|
READ_INFO read_info(file,tot_length,
|
|
|
|
|
ex->cs ? ex->cs : thd->variables.collation_database,
|
2003-03-07 09:55:55 +01:00
|
|
|
*field_term,*ex->line_start, *ex->line_term, *enclosed,
|
2000-09-25 23:33:25 +02:00
|
|
|
info.escape_char, read_file_from_client, is_fifo);
|
2000-07-31 21:29:14 +02:00
|
|
|
if (read_info.error)
|
|
|
|
|
{
|
2010-01-07 06:42:07 +01:00
|
|
|
if (file >= 0)
|
|
|
|
|
mysql_file_close(file, MYF(0)); // no files in net reading
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(TRUE); // Can't allocate buffers
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
|
2003-09-06 15:50:30 +02:00
|
|
|
#ifndef EMBEDDED_LIBRARY
|
2004-01-18 17:51:20 +01:00
|
|
|
if (mysql_bin_log.is_open())
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
|
|
|
|
lf_info.thd = thd;
|
|
|
|
|
lf_info.wrote_create_file = 0;
|
|
|
|
|
lf_info.last_pos_in_file = HA_POS_ERROR;
|
2005-01-27 22:38:56 +01:00
|
|
|
lf_info.log_delayed= transactional_table;
|
2002-07-23 17:31:22 +02:00
|
|
|
read_info.set_io_cache_arg((void*) &lf_info);
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
2003-09-06 15:50:30 +02:00
|
|
|
#endif /*!EMBEDDED_LIBRARY*/
|
|
|
|
|
|
2003-10-11 22:26:39 +02:00
|
|
|
thd->count_cuted_fields= CHECK_FIELD_WARN; /* calc cuted fields */
|
2000-07-31 21:29:14 +02:00
|
|
|
thd->cuted_fields=0L;
|
2003-12-14 05:39:52 +01:00
|
|
|
/* Skip lines if there is a line terminator */
|
2009-10-12 08:22:53 +02:00
|
|
|
if (ex->line_term->length() && ex->filetype != FILETYPE_XML)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2003-12-14 05:39:52 +01:00
|
|
|
/* ex->skip_lines needs to be preserved for logging */
|
|
|
|
|
while (skip_lines > 0)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2003-12-14 05:39:52 +01:00
|
|
|
skip_lines--;
|
2000-07-31 21:29:14 +02:00
|
|
|
if (read_info.next_line())
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2003-12-14 05:39:52 +01:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
if (!(error=test(read_info.error)))
|
|
|
|
|
{
|
2004-04-07 16:04:28 +02:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
table->next_number_field=table->found_next_number_field;
|
2004-12-31 11:04:35 +01:00
|
|
|
if (ignore ||
|
2000-12-24 14:19:00 +01:00
|
|
|
handle_duplicates == DUP_REPLACE)
|
|
|
|
|
table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);
|
2006-07-06 11:33:23 +02:00
|
|
|
if (handle_duplicates == DUP_REPLACE &&
|
|
|
|
|
(!table->triggers ||
|
|
|
|
|
!table->triggers->has_delete_triggers()))
|
2006-07-01 23:51:10 +02:00
|
|
|
table->file->extra(HA_EXTRA_WRITE_CAN_REPLACE);
|
2009-12-01 15:39:03 +01:00
|
|
|
if (thd->locked_tables_mode <= LTM_LOCK_TABLES)
|
2006-06-02 22:21:32 +02:00
|
|
|
table->file->ha_start_bulk_insert((ha_rows) 0);
|
2000-07-31 21:29:14 +02:00
|
|
|
table->copy_blobs=1;
|
2004-09-28 19:08:00 +02:00
|
|
|
|
2005-01-04 12:46:53 +01:00
|
|
|
thd->abort_on_warning= (!ignore &&
|
2004-09-28 19:08:00 +02:00
|
|
|
(thd->variables.sql_mode &
|
|
|
|
|
(MODE_STRICT_TRANS_TABLES |
|
|
|
|
|
MODE_STRICT_ALL_TABLES)));
|
|
|
|
|
|
2009-10-12 08:22:53 +02:00
|
|
|
if (ex->filetype == FILETYPE_XML) /* load xml */
|
|
|
|
|
error= read_xml_field(thd, info, table_list, fields_vars,
|
|
|
|
|
set_fields, set_values, read_info,
|
|
|
|
|
*(ex->line_term), skip_lines, ignore);
|
|
|
|
|
else if (!field_term->length() && !enclosed->length())
|
2005-03-16 02:32:47 +01:00
|
|
|
error= read_fixed_length(thd, info, table_list, fields_vars,
|
|
|
|
|
set_fields, set_values, read_info,
|
2005-01-03 22:04:52 +01:00
|
|
|
skip_lines, ignore);
|
2000-07-31 21:29:14 +02:00
|
|
|
else
|
2005-03-16 02:32:47 +01:00
|
|
|
error= read_sep_field(thd, info, table_list, fields_vars,
|
|
|
|
|
set_fields, set_values, read_info,
|
|
|
|
|
*enclosed, skip_lines, ignore);
|
2009-12-01 15:39:03 +01:00
|
|
|
if (thd->locked_tables_mode <= LTM_LOCK_TABLES &&
|
|
|
|
|
table->file->ha_end_bulk_insert() && !error)
|
2006-02-07 11:47:04 +01:00
|
|
|
{
|
|
|
|
|
table->file->print_error(my_errno, MYF(0));
|
|
|
|
|
error= 1;
|
|
|
|
|
}
|
2000-12-24 14:19:00 +01:00
|
|
|
table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
|
2006-07-01 23:51:10 +02:00
|
|
|
table->file->extra(HA_EXTRA_WRITE_CANNOT_REPLACE);
|
2000-07-31 21:29:14 +02:00
|
|
|
table->next_number_field=0;
|
|
|
|
|
}
|
2003-12-14 05:39:52 +01:00
|
|
|
if (file >= 0)
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_file_close(file, MYF(0));
|
2000-07-31 21:29:14 +02:00
|
|
|
free_blobs(table); /* if pack_blob was used */
|
|
|
|
|
table->copy_blobs=0;
|
2003-10-11 22:26:39 +02:00
|
|
|
thd->count_cuted_fields= CHECK_FIELD_IGNORE;
|
2007-10-29 14:20:59 +01:00
|
|
|
/*
|
|
|
|
|
simulated killing in the middle of per-row loop
|
|
|
|
|
must be effective for binlogging
|
|
|
|
|
*/
|
|
|
|
|
DBUG_EXECUTE_IF("simulate_kill_bug27571",
|
|
|
|
|
{
|
|
|
|
|
error=1;
|
|
|
|
|
thd->killed= THD::KILL_QUERY;
|
|
|
|
|
};);
|
|
|
|
|
killed_status= (error == 0)? THD::NOT_KILLED : thd->killed;
|
2003-05-26 19:48:40 +02:00
|
|
|
/*
|
|
|
|
|
We must invalidate the table in query cache before binlog writing and
|
|
|
|
|
ha_autocommit_...
|
|
|
|
|
*/
|
2003-05-26 18:10:43 +02:00
|
|
|
query_cache_invalidate3(thd, table_list, 0);
|
2000-07-31 21:29:14 +02:00
|
|
|
if (error)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2004-07-13 12:54:20 +02:00
|
|
|
if (read_file_from_client)
|
|
|
|
|
while (!read_info.next_line())
|
|
|
|
|
;
|
2004-07-20 00:53:24 +02:00
|
|
|
|
2003-09-06 15:50:30 +02:00
|
|
|
#ifndef EMBEDDED_LIBRARY
|
2004-01-18 17:51:20 +01:00
|
|
|
if (mysql_bin_log.is_open())
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2001-10-23 21:28:03 +02:00
|
|
|
{
|
2005-12-22 06:39:02 +01:00
|
|
|
/*
|
|
|
|
|
Make sure last block (the one which caused the error) gets
|
|
|
|
|
logged. This is needed because otherwise after write of (to
|
|
|
|
|
the binlog, not to read_info (which is a cache))
|
|
|
|
|
Delete_file_log_event the bad block will remain in read_info
|
|
|
|
|
(because pre_read is not called at the end of the last
|
|
|
|
|
block; remember pre_read is called whenever a new block is
|
|
|
|
|
read from disk). At the end of mysql_load(), the destructor
|
|
|
|
|
of read_info will call end_io_cache() which will flush
|
|
|
|
|
read_info, so we will finally have this in the binlog:
|
|
|
|
|
|
|
|
|
|
Append_block # The last successfull block
|
|
|
|
|
Delete_file
|
|
|
|
|
Append_block # The failing block
|
|
|
|
|
which is nonsense.
|
|
|
|
|
Or could also be (for a small file)
|
|
|
|
|
Create_file # The failing block
|
|
|
|
|
which is nonsense (Delete_file is not written in this case, because:
|
|
|
|
|
Create_file has not been written, so Delete_file is not written, then
|
|
|
|
|
when read_info is destroyed end_io_cache() is called which writes
|
|
|
|
|
Create_file.
|
|
|
|
|
*/
|
|
|
|
|
read_info.end_io_cache();
|
|
|
|
|
/* If the file was not empty, wrote_create_file is true */
|
|
|
|
|
if (lf_info.wrote_create_file)
|
2005-03-25 14:51:17 +01:00
|
|
|
{
|
2009-05-30 15:32:28 +02:00
|
|
|
int errcode= query_error_code(thd, killed_status == THD::NOT_KILLED);
|
|
|
|
|
|
2010-02-04 21:15:47 +01:00
|
|
|
/* since there is already an error, the possible error of
|
|
|
|
|
writing binary log will be ignored */
|
2007-09-15 21:25:56 +02:00
|
|
|
if (thd->transaction.stmt.modified_non_trans_table)
|
2010-02-04 21:15:47 +01:00
|
|
|
(void) write_execute_load_query_log_event(thd, ex,
|
|
|
|
|
table_list->db,
|
|
|
|
|
table_list->table_name,
|
|
|
|
|
handle_duplicates, ignore,
|
|
|
|
|
transactional_table,
|
|
|
|
|
errcode);
|
2005-12-22 06:39:02 +01:00
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
Delete_file_log_event d(thd, db, transactional_table);
|
|
|
|
|
d.flags|= LOG_EVENT_UPDATE_TABLE_MAP_VERSION_F;
|
2010-02-04 21:15:47 +01:00
|
|
|
(void) mysql_bin_log.write(&d);
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
2005-03-25 14:51:17 +01:00
|
|
|
}
|
2001-10-23 21:28:03 +02:00
|
|
|
}
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
2003-09-06 15:50:30 +02:00
|
|
|
#endif /*!EMBEDDED_LIBRARY*/
|
2002-12-13 15:28:15 +01:00
|
|
|
error= -1; // Error on read
|
|
|
|
|
goto err;
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
2003-07-14 12:32:31 +02:00
|
|
|
sprintf(name, ER(ER_LOAD_INFO), (ulong) info.records, (ulong) info.deleted,
|
2009-09-10 11:18:29 +02:00
|
|
|
(ulong) (info.records - info.copied),
|
|
|
|
|
(ulong) thd->warning_info->statement_warn_count());
|
2001-12-06 13:10:51 +01:00
|
|
|
|
2007-07-30 17:27:36 +02:00
|
|
|
if (thd->transaction.stmt.modified_non_trans_table)
|
|
|
|
|
thd->transaction.all.modified_non_trans_table= TRUE;
|
2003-09-06 15:50:30 +02:00
|
|
|
#ifndef EMBEDDED_LIBRARY
|
2001-08-03 23:57:53 +02:00
|
|
|
if (mysql_bin_log.is_open())
|
2000-09-16 03:27:21 +02:00
|
|
|
{
|
2004-01-18 17:51:20 +01:00
|
|
|
/*
|
2005-12-22 06:39:02 +01:00
|
|
|
We need to do the job that is normally done inside
|
|
|
|
|
binlog_query() here, which is to ensure that the pending event
|
|
|
|
|
is written before tables are unlocked and before any other
|
|
|
|
|
events are written. We also need to update the table map
|
|
|
|
|
version for the binary log to mark that table maps are invalid
|
|
|
|
|
after this point.
|
|
|
|
|
*/
|
BUG#39934: Slave stops for engine that only support row-based logging
General overview:
The logic for switching to row format when binlog_format=MIXED had
numerous flaws. The underlying problem was the lack of a consistent
architecture.
General purpose of this changeset:
This changeset introduces an architecture for switching to row format
when binlog_format=MIXED. It enforces the architecture where it has
to. It leaves some bugs to be fixed later. It adds extensive tests to
verify that unsafe statements work as expected and that appropriate
errors are produced by problems with the selection of binlog format.
It was not practical to split this into smaller pieces of work.
Problem 1:
To determine the logging mode, the code has to take several parameters
into account (namely: (1) the value of binlog_format; (2) the
capabilities of the engines; (3) the type of the current statement:
normal, unsafe, or row injection). These parameters may conflict in
several ways, namely:
- binlog_format=STATEMENT for a row injection
- binlog_format=STATEMENT for an unsafe statement
- binlog_format=STATEMENT for an engine only supporting row logging
- binlog_format=ROW for an engine only supporting statement logging
- statement is unsafe and engine does not support row logging
- row injection in a table that does not support statement logging
- statement modifies one table that does not support row logging and
one that does not support statement logging
Several of these conflicts were not detected, or were detected with
an inappropriate error message. The problem of BUG#39934 was that no
appropriate error message was written for the case when an engine
only supporting row logging executed a row injection with
binlog_format=ROW. However, all above cases must be handled.
Fix 1:
Introduce new error codes (sql/share/errmsg.txt). Ensure that all
conditions are detected and handled in decide_logging_format()
Problem 2:
The binlog format shall be determined once per statement, in
decide_logging_format(). It shall not be changed before or after that.
Before decide_logging_format() is called, all information necessary to
determine the logging format must be available. This principle ensures
that all unsafe statements are handled in a consistent way.
However, this principle is not followed:
thd->set_current_stmt_binlog_row_based_if_mixed() is called in several
places, including from code executing UPDATE..LIMIT,
INSERT..SELECT..LIMIT, DELETE..LIMIT, INSERT DELAYED, and
SET @@binlog_format. After Problem 1 was fixed, that caused
inconsistencies where these unsafe statements would not print the
appropriate warnings or errors for some of the conflicts.
Fix 2:
Remove calls to THD::set_current_stmt_binlog_row_based_if_mixed() from
code executed after decide_logging_format(). Compensate by calling the
set_current_stmt_unsafe() at parse time. This way, all unsafe statements
are detected by decide_logging_format().
Problem 3:
INSERT DELAYED is not unsafe: it is logged in statement format even if
binlog_format=MIXED, and no warning is printed even if
binlog_format=STATEMENT. This is BUG#45825.
Fix 3:
Made INSERT DELAYED set itself to unsafe at parse time. This allows
decide_logging_format() to detect that a warning should be printed or
the binlog_format changed.
Problem 4:
LIMIT clause were not marked as unsafe when executed inside stored
functions/triggers/views/prepared statements. This is
BUG#45785.
Fix 4:
Make statements containing the LIMIT clause marked as unsafe at
parse time, instead of at execution time. This allows propagating
unsafe-ness to the view.
2009-07-14 21:31:19 +02:00
|
|
|
if (thd->is_current_stmt_binlog_format_row())
|
2010-01-07 16:39:11 +01:00
|
|
|
error= thd->binlog_flush_pending_rows_event(TRUE, transactional_table);
|
2005-12-22 06:39:02 +01:00
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/*
|
|
|
|
|
As already explained above, we need to call end_io_cache() or the last
|
|
|
|
|
block will be logged only after Execute_load_query_log_event (which is
|
|
|
|
|
wrong), when read_info is destroyed.
|
|
|
|
|
*/
|
|
|
|
|
read_info.end_io_cache();
|
|
|
|
|
if (lf_info.wrote_create_file)
|
|
|
|
|
{
|
2009-05-30 15:32:28 +02:00
|
|
|
int errcode= query_error_code(thd, killed_status == THD::NOT_KILLED);
|
2010-02-04 21:15:47 +01:00
|
|
|
error= write_execute_load_query_log_event(thd, ex,
|
|
|
|
|
table_list->db, table_list->table_name,
|
|
|
|
|
handle_duplicates, ignore,
|
|
|
|
|
transactional_table,
|
|
|
|
|
errcode);
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
|
}
|
2010-02-04 21:15:47 +01:00
|
|
|
if (error)
|
|
|
|
|
goto err;
|
2000-09-16 03:27:21 +02:00
|
|
|
}
|
2003-09-06 15:50:30 +02:00
|
|
|
#endif /*!EMBEDDED_LIBRARY*/
|
2004-09-28 19:08:00 +02:00
|
|
|
|
2007-02-26 20:35:28 +01:00
|
|
|
/* ok to client sent only after binlog write and engine commit */
|
2008-02-19 13:45:21 +01:00
|
|
|
my_ok(thd, info.copied + info.deleted, 0L, name);
|
2002-12-13 15:28:15 +01:00
|
|
|
err:
|
2007-07-30 17:27:36 +02:00
|
|
|
DBUG_ASSERT(transactional_table || !(info.copied || info.deleted) ||
|
|
|
|
|
thd->transaction.stmt.modified_non_trans_table);
|
WL#3146 "less locking in auto_increment":
this is a cleanup patch for our current auto_increment handling:
new names for auto_increment variables in THD, new methods to manipulate them
(see sql_class.h), some move into handler::, causing less backup/restore
work when executing substatements.
This makes the logic hopefully clearer, less work is is needed in
mysql_insert().
By cleaning up, using different variables for different purposes (instead
of one for 3 things...), we fix those bugs, which someone may want to fix
in 5.0 too:
BUG#20339 "stored procedure using LAST_INSERT_ID() does not replicate
statement-based"
BUG#20341 "stored function inserting into one auto_increment puts bad
data in slave"
BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY UPDATE"
(now if a row is updated, LAST_INSERT_ID() will return its id)
and re-fixes:
BUG#6880 "LAST_INSERT_ID() value changes during multi-row INSERT"
(already fixed differently by Ramil in 4.1)
Test of documented behaviour of mysql_insert_id() (there was no test).
The behaviour changes introduced are:
- LAST_INSERT_ID() now returns "the first autogenerated auto_increment value
successfully inserted", instead of "the first autogenerated auto_increment
value if any row was successfully inserted", see auto_increment.test.
Same for mysql_insert_id(), see mysql_client_test.c.
- LAST_INSERT_ID() returns the id of the updated row if ON DUPLICATE KEY
UPDATE, see auto_increment.test. Same for mysql_insert_id(), see
mysql_client_test.c.
- LAST_INSERT_ID() does not change if no autogenerated value was successfully
inserted (it used to then be 0), see auto_increment.test.
- if in INSERT SELECT no autogenerated value was successfully inserted,
mysql_insert_id() now returns the id of the last inserted row (it already
did this for INSERT VALUES), see mysql_client_test.c.
- if INSERT SELECT uses LAST_INSERT_ID(X), mysql_insert_id() now returns X
(it already did this for INSERT VALUES), see mysql_client_test.c.
- NDB now behaves like other engines wrt SET INSERT_ID: with INSERT IGNORE,
the id passed in SET INSERT_ID is re-used until a row succeeds; SET INSERT_ID
influences not only the first row now.
Additionally, when unlocking a table we check that the thread is not keeping
a next_insert_id (as the table is unlocked that id is potentially out-of-date);
forgetting about this next_insert_id is done in a new
handler::ha_release_auto_increment().
Finally we prepare for engines capable of reserving finite-length intervals
of auto_increment values: we store such intervals in THD. The next step
(to be done by the replication team in 5.1) is to read those intervals from
THD and actually store them in the statement-based binary log. NDB
will be a good engine to test that.
2006-07-09 17:52:19 +02:00
|
|
|
table->file->ha_release_auto_increment();
|
2007-03-30 16:13:33 +02:00
|
|
|
table->auto_increment_field_not_null= FALSE;
|
2005-01-27 22:38:56 +01:00
|
|
|
thd->abort_on_warning= 0;
|
2001-08-28 05:43:55 +02:00
|
|
|
DBUG_RETURN(error);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
|
2005-03-25 14:51:17 +01:00
|
|
|
|
2006-12-14 23:51:37 +01:00
|
|
|
#ifndef EMBEDDED_LIBRARY
|
|
|
|
|
|
2005-03-25 14:51:17 +01:00
|
|
|
/* Not a very useful function; just to avoid duplication of code */
|
2009-09-28 14:41:10 +02:00
|
|
|
static bool write_execute_load_query_log_event(THD *thd, sql_exchange* ex,
|
2009-10-27 16:15:53 +01:00
|
|
|
const char* db_arg, /* table's database */
|
2009-09-28 14:41:10 +02:00
|
|
|
const char* table_name_arg,
|
|
|
|
|
enum enum_duplicates duplicates,
|
|
|
|
|
bool ignore,
|
|
|
|
|
bool transactional_table,
|
2009-05-30 15:32:28 +02:00
|
|
|
int errcode)
|
2005-03-25 14:51:17 +01:00
|
|
|
{
|
2009-09-28 14:41:10 +02:00
|
|
|
char *load_data_query,
|
|
|
|
|
*end,
|
|
|
|
|
*fname_start,
|
|
|
|
|
*fname_end,
|
|
|
|
|
*p= NULL;
|
|
|
|
|
size_t pl= 0;
|
|
|
|
|
List<Item> fv;
|
|
|
|
|
Item *item, *val;
|
|
|
|
|
String pfield, pfields;
|
|
|
|
|
int n;
|
2009-10-27 16:15:53 +01:00
|
|
|
const char *tbl= table_name_arg;
|
|
|
|
|
const char *tdb= (thd->db != NULL ? thd->db : db_arg);
|
|
|
|
|
String string_buf;
|
2009-09-28 14:41:10 +02:00
|
|
|
|
2009-10-27 16:15:53 +01:00
|
|
|
if (!thd->db || strcmp(db_arg, thd->db))
|
|
|
|
|
{
|
|
|
|
|
/*
|
|
|
|
|
If used database differs from table's database,
|
|
|
|
|
prefix table name with database name so that it
|
|
|
|
|
becomes a FQ name.
|
|
|
|
|
*/
|
|
|
|
|
string_buf.set_charset(system_charset_info);
|
|
|
|
|
string_buf.append(db_arg);
|
|
|
|
|
string_buf.append("`");
|
|
|
|
|
string_buf.append(".");
|
|
|
|
|
string_buf.append("`");
|
|
|
|
|
string_buf.append(table_name_arg);
|
|
|
|
|
tbl= string_buf.c_ptr_safe();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Load_log_event lle(thd, ex, tdb, tbl, fv, duplicates,
|
2009-09-28 14:41:10 +02:00
|
|
|
ignore, transactional_table);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
force in a LOCAL if there was one in the original.
|
|
|
|
|
*/
|
|
|
|
|
if (thd->lex->local_file)
|
|
|
|
|
lle.set_fname_outside_temp_buf(ex->file_name, strlen(ex->file_name));
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
prepare fields-list and SET if needed; print_query won't do that for us.
|
|
|
|
|
*/
|
|
|
|
|
if (!thd->lex->field_list.is_empty())
|
|
|
|
|
{
|
|
|
|
|
List_iterator<Item> li(thd->lex->field_list);
|
|
|
|
|
|
|
|
|
|
pfields.append(" (");
|
|
|
|
|
n= 0;
|
|
|
|
|
|
|
|
|
|
while ((item= li++))
|
|
|
|
|
{
|
|
|
|
|
if (n++)
|
|
|
|
|
pfields.append(", ");
|
|
|
|
|
if (item->name)
|
2009-12-06 02:11:32 +01:00
|
|
|
{
|
|
|
|
|
pfields.append("`");
|
2009-09-28 14:41:10 +02:00
|
|
|
pfields.append(item->name);
|
2009-12-06 02:11:32 +01:00
|
|
|
pfields.append("`");
|
|
|
|
|
}
|
2009-09-28 14:41:10 +02:00
|
|
|
else
|
|
|
|
|
item->print(&pfields, QT_ORDINARY);
|
|
|
|
|
}
|
|
|
|
|
pfields.append(")");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!thd->lex->update_list.is_empty())
|
|
|
|
|
{
|
|
|
|
|
List_iterator<Item> lu(thd->lex->update_list);
|
|
|
|
|
List_iterator<Item> lv(thd->lex->value_list);
|
|
|
|
|
|
|
|
|
|
pfields.append(" SET ");
|
|
|
|
|
n= 0;
|
|
|
|
|
|
|
|
|
|
while ((item= lu++))
|
|
|
|
|
{
|
|
|
|
|
val= lv++;
|
|
|
|
|
if (n++)
|
|
|
|
|
pfields.append(", ");
|
2009-12-06 02:11:32 +01:00
|
|
|
pfields.append("`");
|
2009-09-28 14:41:10 +02:00
|
|
|
pfields.append(item->name);
|
2009-12-06 02:11:32 +01:00
|
|
|
pfields.append("`");
|
2009-09-28 14:41:10 +02:00
|
|
|
pfields.append("=");
|
|
|
|
|
val->print(&pfields, QT_ORDINARY);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
p= pfields.c_ptr_safe();
|
|
|
|
|
pl= strlen(p);
|
|
|
|
|
|
|
|
|
|
if (!(load_data_query= (char *)thd->alloc(lle.get_query_buffer_length() + 1 + pl)))
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
lle.print_query(FALSE, (const char *) ex->cs?ex->cs->csname:NULL,
|
|
|
|
|
load_data_query, &end,
|
|
|
|
|
(char **)&fname_start, (char **)&fname_end);
|
|
|
|
|
|
|
|
|
|
strcpy(end, p);
|
|
|
|
|
end += pl;
|
|
|
|
|
|
2009-10-16 12:29:42 +02:00
|
|
|
thd->set_query_inner(load_data_query, end - load_data_query);
|
2009-09-28 14:41:10 +02:00
|
|
|
|
2005-03-25 14:51:17 +01:00
|
|
|
Execute_load_query_log_event
|
2009-10-16 12:29:42 +02:00
|
|
|
e(thd, thd->query(), thd->query_length(),
|
|
|
|
|
(uint) ((char*) fname_start - (char*) thd->query() - 1),
|
|
|
|
|
(uint) ((char*) fname_end - (char*) thd->query()),
|
2005-03-25 14:51:17 +01:00
|
|
|
(duplicates == DUP_REPLACE) ? LOAD_DUP_REPLACE :
|
|
|
|
|
(ignore ? LOAD_DUP_IGNORE : LOAD_DUP_ERROR),
|
2009-11-03 20:02:56 +01:00
|
|
|
transactional_table, FALSE, FALSE, errcode);
|
2007-10-30 12:49:42 +01:00
|
|
|
e.flags|= LOG_EVENT_UPDATE_TABLE_MAP_VERSION_F;
|
2005-03-25 14:51:17 +01:00
|
|
|
return mysql_bin_log.write(&e);
|
|
|
|
|
}
|
|
|
|
|
|
2006-12-14 23:51:37 +01:00
|
|
|
#endif
|
2005-03-25 14:51:17 +01:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
/****************************************************************************
|
|
|
|
|
** Read of rows of fixed size + optional garage + optonal newline
|
|
|
|
|
****************************************************************************/
|
|
|
|
|
|
|
|
|
|
static int
|
2004-10-21 20:53:27 +02:00
|
|
|
read_fixed_length(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
|
2005-03-16 02:32:47 +01:00
|
|
|
List<Item> &fields_vars, List<Item> &set_fields,
|
|
|
|
|
List<Item> &set_values, READ_INFO &read_info,
|
|
|
|
|
ulong skip_lines, bool ignore_check_option_errors)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2005-03-16 02:32:47 +01:00
|
|
|
List_iterator_fast<Item> it(fields_vars);
|
2000-07-31 21:29:14 +02:00
|
|
|
Item_field *sql_field;
|
2004-10-21 20:53:27 +02:00
|
|
|
TABLE *table= table_list->table;
|
2003-01-14 10:27:26 +01:00
|
|
|
ulonglong id;
|
2007-07-30 17:27:36 +02:00
|
|
|
bool err;
|
2000-07-31 21:29:14 +02:00
|
|
|
DBUG_ENTER("read_fixed_length");
|
|
|
|
|
|
2003-04-22 09:53:07 +02:00
|
|
|
id= 0;
|
2005-03-16 02:32:47 +01:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
while (!read_info.read_fixed_length())
|
|
|
|
|
{
|
|
|
|
|
if (thd->killed)
|
|
|
|
|
{
|
2003-04-08 16:18:33 +02:00
|
|
|
thd->send_kill_message();
|
2000-07-31 21:29:14 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
}
|
2003-12-14 05:39:52 +01:00
|
|
|
if (skip_lines)
|
|
|
|
|
{
|
|
|
|
|
/*
|
|
|
|
|
We could implement this with a simple seek if:
|
|
|
|
|
- We are not using DATA INFILE LOCAL
|
|
|
|
|
- escape character is ""
|
|
|
|
|
- line starting prefix is ""
|
|
|
|
|
*/
|
|
|
|
|
skip_lines--;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2000-07-31 21:29:14 +02:00
|
|
|
it.rewind();
|
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 *pos=read_info.row_start;
|
2000-07-31 21:29:14 +02:00
|
|
|
#ifdef HAVE_purify
|
|
|
|
|
read_info.row_end[0]=0;
|
|
|
|
|
#endif
|
2005-03-16 02:32:47 +01:00
|
|
|
|
|
|
|
|
restore_record(table, s->default_values);
|
|
|
|
|
/*
|
|
|
|
|
There is no variables in fields_vars list in this format so
|
|
|
|
|
this conversion is safe.
|
|
|
|
|
*/
|
2000-07-31 21:29:14 +02:00
|
|
|
while ((sql_field= (Item_field*) it++))
|
|
|
|
|
{
|
2003-04-30 09:02:28 +02:00
|
|
|
Field *field= sql_field->field;
|
2005-09-22 09:46:01 +02:00
|
|
|
if (field == table->next_number_field)
|
|
|
|
|
table->auto_increment_field_not_null= TRUE;
|
2005-03-16 02:32:47 +01:00
|
|
|
/*
|
|
|
|
|
No fields specified in fields_vars list can be null in this format.
|
|
|
|
|
Mark field as not null, we should do this for each row because of
|
|
|
|
|
restore_record...
|
|
|
|
|
*/
|
|
|
|
|
field->set_notnull();
|
|
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
if (pos == read_info.row_end)
|
|
|
|
|
{
|
2003-04-22 09:53:07 +02:00
|
|
|
thd->cuted_fields++; /* Not enough fields */
|
2009-09-10 11:18:29 +02:00
|
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
|
|
|
|
ER_WARN_TOO_FEW_RECORDS,
|
|
|
|
|
ER(ER_WARN_TOO_FEW_RECORDS),
|
|
|
|
|
thd->warning_info->current_row_for_warning());
|
2007-05-08 22:23:16 +02:00
|
|
|
if (!field->maybe_null() && field->type() == FIELD_TYPE_TIMESTAMP)
|
|
|
|
|
((Field_timestamp*) field)->set_time();
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
uint 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
|
|
|
uchar save_chr;
|
2000-07-31 21:29:14 +02:00
|
|
|
if ((length=(uint) (read_info.row_end-pos)) >
|
|
|
|
|
field->field_length)
|
|
|
|
|
length=field->field_length;
|
|
|
|
|
save_chr=pos[length]; pos[length]='\0'; // Safeguard aganst malloc
|
2004-09-28 19:08:00 +02:00
|
|
|
field->store((char*) pos,length,read_info.read_charset);
|
2000-07-31 21:29:14 +02:00
|
|
|
pos[length]=save_chr;
|
|
|
|
|
if ((pos+=length) > read_info.row_end)
|
|
|
|
|
pos= read_info.row_end; /* Fills rest with space */
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (pos != read_info.row_end)
|
2003-04-22 09:53:07 +02:00
|
|
|
{
|
2000-07-31 21:29:14 +02:00
|
|
|
thd->cuted_fields++; /* To long row */
|
2009-09-10 11:18:29 +02:00
|
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
|
|
|
|
ER_WARN_TOO_MANY_RECORDS,
|
|
|
|
|
ER(ER_WARN_TOO_MANY_RECORDS),
|
|
|
|
|
thd->warning_info->current_row_for_warning());
|
2003-04-22 09:53:07 +02:00
|
|
|
}
|
2004-10-21 20:53:27 +02:00
|
|
|
|
2005-05-24 20:19:33 +02:00
|
|
|
if (thd->killed ||
|
|
|
|
|
fill_record_n_invoke_before_triggers(thd, set_fields, set_values,
|
|
|
|
|
ignore_check_option_errors,
|
|
|
|
|
table->triggers,
|
|
|
|
|
TRG_EVENT_INSERT))
|
2005-03-16 02:32:47 +01:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
|
2005-01-03 22:04:52 +01:00
|
|
|
switch (table_list->view_check_option(thd,
|
|
|
|
|
ignore_check_option_errors)) {
|
2004-10-21 20:53:27 +02:00
|
|
|
case VIEW_CHECK_SKIP:
|
|
|
|
|
read_info.next_line();
|
|
|
|
|
goto continue_loop;
|
|
|
|
|
case VIEW_CHECK_ERROR:
|
|
|
|
|
DBUG_RETURN(-1);
|
|
|
|
|
}
|
|
|
|
|
|
2007-04-06 22:13:27 +02:00
|
|
|
err= write_record(thd, table, &info);
|
|
|
|
|
table->auto_increment_field_not_null= FALSE;
|
|
|
|
|
if (err)
|
2000-07-31 21:29:14 +02:00
|
|
|
DBUG_RETURN(1);
|
2004-09-28 19:08:00 +02:00
|
|
|
|
2005-05-24 20:19:33 +02:00
|
|
|
/*
|
|
|
|
|
We don't need to reset auto-increment field since we are restoring
|
|
|
|
|
its default value at the beginning of each loop iteration.
|
|
|
|
|
*/
|
2001-11-06 23:13:29 +01:00
|
|
|
if (read_info.next_line()) // Skip to next line
|
2000-07-31 21:29:14 +02:00
|
|
|
break;
|
|
|
|
|
if (read_info.line_cuted)
|
2003-04-22 09:53:07 +02:00
|
|
|
{
|
2000-07-31 21:29:14 +02:00
|
|
|
thd->cuted_fields++; /* To long row */
|
2009-09-10 11:18:29 +02:00
|
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
|
|
|
|
ER_WARN_TOO_MANY_RECORDS,
|
|
|
|
|
ER(ER_WARN_TOO_MANY_RECORDS),
|
|
|
|
|
thd->warning_info->current_row_for_warning());
|
2003-04-22 09:53:07 +02:00
|
|
|
}
|
2009-09-10 11:18:29 +02:00
|
|
|
thd->warning_info->inc_current_row_for_warning();
|
2004-10-21 20:53:27 +02:00
|
|
|
continue_loop:;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
DBUG_RETURN(test(read_info.error));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
2004-10-21 20:53:27 +02:00
|
|
|
read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
|
2005-03-16 02:32:47 +01:00
|
|
|
List<Item> &fields_vars, List<Item> &set_fields,
|
|
|
|
|
List<Item> &set_values, READ_INFO &read_info,
|
2004-10-21 20:53:27 +02:00
|
|
|
String &enclosed, ulong skip_lines,
|
|
|
|
|
bool ignore_check_option_errors)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2005-03-16 02:32:47 +01:00
|
|
|
List_iterator_fast<Item> it(fields_vars);
|
|
|
|
|
Item *item;
|
2004-10-21 20:53:27 +02:00
|
|
|
TABLE *table= table_list->table;
|
2000-07-31 21:29:14 +02:00
|
|
|
uint enclosed_length;
|
2003-01-14 10:27:26 +01:00
|
|
|
ulonglong id;
|
2007-07-30 17:27:36 +02:00
|
|
|
bool err;
|
2000-07-31 21:29:14 +02:00
|
|
|
DBUG_ENTER("read_sep_field");
|
|
|
|
|
|
|
|
|
|
enclosed_length=enclosed.length();
|
2003-04-22 09:53:07 +02:00
|
|
|
id= 0;
|
|
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
for (;;it.rewind())
|
|
|
|
|
{
|
|
|
|
|
if (thd->killed)
|
|
|
|
|
{
|
2003-04-08 16:18:33 +02:00
|
|
|
thd->send_kill_message();
|
2000-07-31 21:29:14 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
}
|
2005-03-16 02:32:47 +01:00
|
|
|
|
|
|
|
|
restore_record(table, s->default_values);
|
|
|
|
|
|
|
|
|
|
while ((item= it++))
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
|
uint 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
|
|
|
uchar *pos;
|
2008-03-28 16:59:13 +01:00
|
|
|
Item *real_item;
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
|
if (read_info.read_field())
|
|
|
|
|
break;
|
2005-03-16 02:32:47 +01:00
|
|
|
|
|
|
|
|
/* If this line is to be skipped we don't want to fill field or var */
|
|
|
|
|
if (skip_lines)
|
|
|
|
|
continue;
|
|
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
pos=read_info.row_start;
|
|
|
|
|
length=(uint) (read_info.row_end-pos);
|
|
|
|
|
|
2008-03-28 16:59:13 +01:00
|
|
|
real_item= item->real_item();
|
|
|
|
|
|
2009-06-10 16:04:07 +02:00
|
|
|
if ((!read_info.enclosed &&
|
2005-11-20 19:47:07 +01:00
|
|
|
(enclosed_length && length == 4 &&
|
2009-06-10 16:04:07 +02:00
|
|
|
!memcmp(pos, STRING_WITH_LEN("NULL")))) ||
|
2000-07-31 21:29:14 +02:00
|
|
|
(length == 1 && read_info.found_null))
|
|
|
|
|
{
|
2008-03-28 16:59:13 +01:00
|
|
|
|
|
|
|
|
if (real_item->type() == Item::FIELD_ITEM)
|
2005-03-16 02:32:47 +01:00
|
|
|
{
|
2008-03-28 16:59:13 +01:00
|
|
|
Field *field= ((Item_field *)real_item)->field;
|
2006-12-06 19:02:39 +01:00
|
|
|
if (field->reset())
|
|
|
|
|
{
|
|
|
|
|
my_error(ER_WARN_NULL_TO_NOTNULL, MYF(0), field->field_name,
|
2009-09-10 11:18:29 +02:00
|
|
|
thd->warning_info->current_row_for_warning());
|
2006-12-06 19:02:39 +01:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
}
|
2005-03-16 02:32:47 +01:00
|
|
|
field->set_null();
|
|
|
|
|
if (!field->maybe_null())
|
|
|
|
|
{
|
2006-12-02 02:26:52 +01:00
|
|
|
if (field->type() == MYSQL_TYPE_TIMESTAMP)
|
2005-03-16 02:32:47 +01:00
|
|
|
((Field_timestamp*) field)->set_time();
|
|
|
|
|
else if (field != table->next_number_field)
|
2005-04-01 14:04:50 +02:00
|
|
|
field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN,
|
2005-03-16 02:32:47 +01:00
|
|
|
ER_WARN_NULL_TO_NOTNULL, 1);
|
|
|
|
|
}
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2008-03-28 16:59:13 +01:00
|
|
|
else if (item->type() == Item::STRING_ITEM)
|
|
|
|
|
{
|
2005-03-16 02:32:47 +01:00
|
|
|
((Item_user_var_as_out_param *)item)->set_null_value(
|
|
|
|
|
read_info.read_charset);
|
2008-03-28 16:59:13 +01:00
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
my_error(ER_LOAD_DATA_INVALID_COLUMN, MYF(0), item->full_name());
|
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
}
|
|
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
continue;
|
|
|
|
|
}
|
2005-03-16 02:32:47 +01:00
|
|
|
|
2008-03-28 16:59:13 +01:00
|
|
|
if (real_item->type() == Item::FIELD_ITEM)
|
2005-03-16 02:32:47 +01:00
|
|
|
{
|
2008-03-28 16:59:13 +01:00
|
|
|
Field *field= ((Item_field *)real_item)->field;
|
2005-03-16 02:32:47 +01:00
|
|
|
field->set_notnull();
|
|
|
|
|
read_info.row_end[0]=0; // Safe to change end marker
|
2005-09-23 14:37:22 +02:00
|
|
|
if (field == table->next_number_field)
|
|
|
|
|
table->auto_increment_field_not_null= TRUE;
|
2005-03-16 02:32:47 +01:00
|
|
|
field->store((char*) pos, length, read_info.read_charset);
|
|
|
|
|
}
|
2008-03-28 16:59:13 +01:00
|
|
|
else if (item->type() == Item::STRING_ITEM)
|
|
|
|
|
{
|
2005-03-16 02:32:47 +01:00
|
|
|
((Item_user_var_as_out_param *)item)->set_value((char*) pos, length,
|
2008-03-28 16:59:13 +01:00
|
|
|
read_info.read_charset);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
my_error(ER_LOAD_DATA_INVALID_COLUMN, MYF(0), item->full_name());
|
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
}
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
if (read_info.error)
|
|
|
|
|
break;
|
2003-12-14 05:39:52 +01:00
|
|
|
if (skip_lines)
|
|
|
|
|
{
|
2005-03-16 02:32:47 +01:00
|
|
|
skip_lines--;
|
2003-12-14 05:39:52 +01:00
|
|
|
continue;
|
|
|
|
|
}
|
2005-03-16 02:32:47 +01:00
|
|
|
if (item)
|
|
|
|
|
{
|
|
|
|
|
/* Have not read any field, thus input file is simply ended */
|
|
|
|
|
if (item == fields_vars.head())
|
2000-07-31 21:29:14 +02:00
|
|
|
break;
|
2005-03-16 02:32:47 +01:00
|
|
|
for (; item ; item= it++)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2008-03-28 16:59:13 +01:00
|
|
|
Item *real_item= item->real_item();
|
|
|
|
|
if (real_item->type() == Item::FIELD_ITEM)
|
2005-03-16 02:32:47 +01:00
|
|
|
{
|
2008-03-28 16:59:13 +01:00
|
|
|
Field *field= ((Item_field *)real_item)->field;
|
2006-12-06 19:02:39 +01:00
|
|
|
if (field->reset())
|
|
|
|
|
{
|
2006-12-07 06:11:56 +01:00
|
|
|
my_error(ER_WARN_NULL_TO_NOTNULL, MYF(0),field->field_name,
|
2009-09-10 11:18:29 +02:00
|
|
|
thd->warning_info->current_row_for_warning());
|
2006-12-06 19:02:39 +01:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
}
|
2007-05-08 22:23:16 +02:00
|
|
|
if (!field->maybe_null() && field->type() == FIELD_TYPE_TIMESTAMP)
|
|
|
|
|
((Field_timestamp*) field)->set_time();
|
2005-03-16 02:32:47 +01:00
|
|
|
/*
|
|
|
|
|
QQ: We probably should not throw warning for each field.
|
|
|
|
|
But how about intention to always have the same number
|
|
|
|
|
of warnings in THD::cuted_fields (and get rid of cuted_fields
|
|
|
|
|
in the end ?)
|
|
|
|
|
*/
|
|
|
|
|
thd->cuted_fields++;
|
|
|
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
|
|
|
|
ER_WARN_TOO_FEW_RECORDS,
|
2009-09-10 11:18:29 +02:00
|
|
|
ER(ER_WARN_TOO_FEW_RECORDS),
|
|
|
|
|
thd->warning_info->current_row_for_warning());
|
2005-03-16 02:32:47 +01:00
|
|
|
}
|
2008-03-28 16:59:13 +01:00
|
|
|
else if (item->type() == Item::STRING_ITEM)
|
|
|
|
|
{
|
2005-03-16 02:32:47 +01:00
|
|
|
((Item_user_var_as_out_param *)item)->set_null_value(
|
|
|
|
|
read_info.read_charset);
|
2008-03-28 16:59:13 +01:00
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
my_error(ER_LOAD_DATA_INVALID_COLUMN, MYF(0), item->full_name());
|
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
}
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
}
|
2004-10-21 20:53:27 +02:00
|
|
|
|
2005-05-24 20:19:33 +02:00
|
|
|
if (thd->killed ||
|
|
|
|
|
fill_record_n_invoke_before_triggers(thd, set_fields, set_values,
|
|
|
|
|
ignore_check_option_errors,
|
|
|
|
|
table->triggers,
|
|
|
|
|
TRG_EVENT_INSERT))
|
2005-03-16 02:32:47 +01:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
|
2005-01-03 22:04:52 +01:00
|
|
|
switch (table_list->view_check_option(thd,
|
|
|
|
|
ignore_check_option_errors)) {
|
2004-10-21 20:53:27 +02:00
|
|
|
case VIEW_CHECK_SKIP:
|
|
|
|
|
read_info.next_line();
|
|
|
|
|
goto continue_loop;
|
|
|
|
|
case VIEW_CHECK_ERROR:
|
|
|
|
|
DBUG_RETURN(-1);
|
|
|
|
|
}
|
|
|
|
|
|
2007-04-06 22:13:27 +02:00
|
|
|
err= write_record(thd, table, &info);
|
|
|
|
|
table->auto_increment_field_not_null= FALSE;
|
|
|
|
|
if (err)
|
2000-07-31 21:29:14 +02:00
|
|
|
DBUG_RETURN(1);
|
2005-05-24 20:19:33 +02:00
|
|
|
/*
|
|
|
|
|
We don't need to reset auto-increment field since we are restoring
|
|
|
|
|
its default value at the beginning of each loop iteration.
|
|
|
|
|
*/
|
2001-11-06 23:13:29 +01:00
|
|
|
if (read_info.next_line()) // Skip to next line
|
2000-07-31 21:29:14 +02:00
|
|
|
break;
|
|
|
|
|
if (read_info.line_cuted)
|
2003-04-22 09:53:07 +02:00
|
|
|
{
|
2000-07-31 21:29:14 +02:00
|
|
|
thd->cuted_fields++; /* To long row */
|
2009-09-10 11:18:29 +02:00
|
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
|
|
|
|
ER_WARN_TOO_MANY_RECORDS, ER(ER_WARN_TOO_MANY_RECORDS),
|
|
|
|
|
thd->warning_info->current_row_for_warning());
|
2004-09-28 19:08:00 +02:00
|
|
|
if (thd->killed)
|
|
|
|
|
DBUG_RETURN(1);
|
2003-04-22 09:53:07 +02:00
|
|
|
}
|
2009-09-10 11:18:29 +02:00
|
|
|
thd->warning_info->inc_current_row_for_warning();
|
2004-10-21 20:53:27 +02:00
|
|
|
continue_loop:;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
DBUG_RETURN(test(read_info.error));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-10-12 08:22:53 +02:00
|
|
|
/****************************************************************************
|
|
|
|
|
** Read rows in xml format
|
|
|
|
|
****************************************************************************/
|
|
|
|
|
static int
|
|
|
|
|
read_xml_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
|
|
|
|
|
List<Item> &fields_vars, List<Item> &set_fields,
|
|
|
|
|
List<Item> &set_values, READ_INFO &read_info,
|
|
|
|
|
String &row_tag, ulong skip_lines,
|
|
|
|
|
bool ignore_check_option_errors)
|
|
|
|
|
{
|
|
|
|
|
List_iterator_fast<Item> it(fields_vars);
|
|
|
|
|
Item *item;
|
|
|
|
|
TABLE *table= table_list->table;
|
|
|
|
|
bool no_trans_update_stmt;
|
|
|
|
|
CHARSET_INFO *cs= read_info.read_charset;
|
|
|
|
|
DBUG_ENTER("read_xml_field");
|
|
|
|
|
|
|
|
|
|
no_trans_update_stmt= !table->file->has_transactions();
|
|
|
|
|
|
|
|
|
|
for ( ; ; it.rewind())
|
|
|
|
|
{
|
|
|
|
|
if (thd->killed)
|
|
|
|
|
{
|
|
|
|
|
thd->send_kill_message();
|
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// read row tag and save values into tag list
|
|
|
|
|
if (read_info.read_xml())
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
List_iterator_fast<XML_TAG> xmlit(read_info.taglist);
|
|
|
|
|
xmlit.rewind();
|
|
|
|
|
XML_TAG *tag= NULL;
|
|
|
|
|
|
|
|
|
|
#ifndef DBUG_OFF
|
|
|
|
|
DBUG_PRINT("read_xml_field", ("skip_lines=%d", (int) skip_lines));
|
|
|
|
|
while ((tag= xmlit++))
|
|
|
|
|
{
|
|
|
|
|
DBUG_PRINT("read_xml_field", ("got tag:%i '%s' '%s'",
|
|
|
|
|
tag->level, tag->field.c_ptr(),
|
|
|
|
|
tag->value.c_ptr()));
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
restore_record(table, s->default_values);
|
|
|
|
|
|
|
|
|
|
while ((item= it++))
|
|
|
|
|
{
|
|
|
|
|
/* If this line is to be skipped we don't want to fill field or var */
|
|
|
|
|
if (skip_lines)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
/* find field in tag list */
|
|
|
|
|
xmlit.rewind();
|
|
|
|
|
tag= xmlit++;
|
|
|
|
|
|
|
|
|
|
while(tag && strcmp(tag->field.c_ptr(), item->name) != 0)
|
|
|
|
|
tag= xmlit++;
|
|
|
|
|
|
|
|
|
|
if (!tag) // found null
|
|
|
|
|
{
|
|
|
|
|
if (item->type() == Item::FIELD_ITEM)
|
|
|
|
|
{
|
|
|
|
|
Field *field= ((Item_field *) item)->field;
|
|
|
|
|
field->reset();
|
|
|
|
|
field->set_null();
|
|
|
|
|
if (field == table->next_number_field)
|
|
|
|
|
table->auto_increment_field_not_null= TRUE;
|
|
|
|
|
if (!field->maybe_null())
|
|
|
|
|
{
|
|
|
|
|
if (field->type() == FIELD_TYPE_TIMESTAMP)
|
|
|
|
|
((Field_timestamp *) field)->set_time();
|
|
|
|
|
else if (field != table->next_number_field)
|
|
|
|
|
field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN,
|
|
|
|
|
ER_WARN_NULL_TO_NOTNULL, 1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
((Item_user_var_as_out_param *) item)->set_null_value(cs);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (item->type() == Item::FIELD_ITEM)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
Field *field= ((Item_field *)item)->field;
|
|
|
|
|
field->set_notnull();
|
|
|
|
|
if (field == table->next_number_field)
|
|
|
|
|
table->auto_increment_field_not_null= TRUE;
|
|
|
|
|
field->store((char *) tag->value.ptr(), tag->value.length(), cs);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
((Item_user_var_as_out_param *) item)->set_value(
|
|
|
|
|
(char *) tag->value.ptr(),
|
|
|
|
|
tag->value.length(), cs);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (read_info.error)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
if (skip_lines)
|
|
|
|
|
{
|
|
|
|
|
skip_lines--;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (item)
|
|
|
|
|
{
|
|
|
|
|
/* Have not read any field, thus input file is simply ended */
|
|
|
|
|
if (item == fields_vars.head())
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
for ( ; item; item= it++)
|
|
|
|
|
{
|
|
|
|
|
if (item->type() == Item::FIELD_ITEM)
|
|
|
|
|
{
|
|
|
|
|
/*
|
|
|
|
|
QQ: We probably should not throw warning for each field.
|
|
|
|
|
But how about intention to always have the same number
|
|
|
|
|
of warnings in THD::cuted_fields (and get rid of cuted_fields
|
|
|
|
|
in the end ?)
|
|
|
|
|
*/
|
|
|
|
|
thd->cuted_fields++;
|
|
|
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
|
|
|
|
ER_WARN_TOO_FEW_RECORDS,
|
|
|
|
|
ER(ER_WARN_TOO_FEW_RECORDS),
|
|
|
|
|
thd->warning_info->current_row_for_warning());
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
((Item_user_var_as_out_param *)item)->set_null_value(cs);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (thd->killed ||
|
|
|
|
|
fill_record_n_invoke_before_triggers(thd, set_fields, set_values,
|
|
|
|
|
ignore_check_option_errors,
|
|
|
|
|
table->triggers,
|
|
|
|
|
TRG_EVENT_INSERT))
|
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
|
|
|
|
|
switch (table_list->view_check_option(thd,
|
|
|
|
|
ignore_check_option_errors)) {
|
|
|
|
|
case VIEW_CHECK_SKIP:
|
|
|
|
|
read_info.next_line();
|
|
|
|
|
goto continue_loop;
|
|
|
|
|
case VIEW_CHECK_ERROR:
|
|
|
|
|
DBUG_RETURN(-1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (write_record(thd, table, &info))
|
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
We don't need to reset auto-increment field since we are restoring
|
|
|
|
|
its default value at the beginning of each loop iteration.
|
|
|
|
|
*/
|
|
|
|
|
thd->transaction.stmt.modified_non_trans_table= no_trans_update_stmt;
|
|
|
|
|
thd->warning_info->inc_current_row_for_warning();
|
|
|
|
|
continue_loop:;
|
|
|
|
|
}
|
|
|
|
|
DBUG_RETURN(test(read_info.error) || thd->is_error());
|
|
|
|
|
} /* load xml end */
|
|
|
|
|
|
|
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
/* Unescape all escape characters, mark \N as null */
|
|
|
|
|
|
|
|
|
|
char
|
|
|
|
|
READ_INFO::unescape(char chr)
|
|
|
|
|
{
|
Fixed bug #29294.
The `SELECT 'r' INTO OUTFILE ... FIELDS ENCLOSED BY 'r' ' statement
encoded the 'r' string to a 4 byte string of value x'725c7272'
(sequence of 4 characters: r\rr).
The LOAD DATA statement decoded this string to a 1 byte string of
value x'0d' (ASCII Carriage Return character) instead of the original
'r' character.
The same error also happened with the FIELDS ENCLOSED BY clause
followed by special characters: 'n', 't', 'r', 'b', '0', 'Z' and 'N'.
NOTE 1: This is a result of the undocumented feature: the LOAD DATA INFILE
recognises 2-byte input sequences like \n, \t, \r and \Z in addition
to documented 2-byte sequences: \0 and \N. This feature should be
documented (here backspace character is a default ESCAPED BY character,
in the real-life example it may be any ESCAPED BY character).
NOTE 2, changed behaviour:
Now the `SELECT INTO OUTFILE' statement with the `FIELDS ENCLOSED BY'
clause followed by one of: 'n', 't', 'r', 'b', '0', 'Z' or 'N' characters
encodes this special character itself by doubling it ('r' --> 'rr'),
not by prepending it with an escape character.
2007-07-03 16:37:46 +02:00
|
|
|
/* keep this switch synchornous with the ESCAPE_CHARS macro */
|
2000-07-31 21:29:14 +02:00
|
|
|
switch(chr) {
|
|
|
|
|
case 'n': return '\n';
|
|
|
|
|
case 't': return '\t';
|
|
|
|
|
case 'r': return '\r';
|
|
|
|
|
case 'b': return '\b';
|
|
|
|
|
case '0': return 0; // Ascii null
|
|
|
|
|
case 'Z': return '\032'; // Win32 end of file
|
|
|
|
|
case 'N': found_null=1;
|
|
|
|
|
|
|
|
|
|
/* fall through */
|
|
|
|
|
default: return chr;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2002-06-11 10:20:31 +02:00
|
|
|
/*
|
|
|
|
|
Read a line using buffering
|
|
|
|
|
If last line is empty (in line mode) then it isn't outputed
|
|
|
|
|
*/
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
|
|
2003-03-07 09:55:55 +01:00
|
|
|
READ_INFO::READ_INFO(File file_par, uint tot_length, CHARSET_INFO *cs,
|
|
|
|
|
String &field_term, String &line_start, String &line_term,
|
2000-09-25 23:33:25 +02:00
|
|
|
String &enclosed_par, int escape, bool get_it_from_net,
|
|
|
|
|
bool is_fifo)
|
2000-07-31 21:29:14 +02:00
|
|
|
:file(file_par),escape_char(escape)
|
|
|
|
|
{
|
2003-03-07 09:55:55 +01:00
|
|
|
read_charset= cs;
|
2000-07-31 21:29:14 +02:00
|
|
|
field_term_ptr=(char*) field_term.ptr();
|
|
|
|
|
field_term_length= field_term.length();
|
|
|
|
|
line_term_ptr=(char*) line_term.ptr();
|
|
|
|
|
line_term_length= line_term.length();
|
2009-10-12 08:22:53 +02:00
|
|
|
level= 0; /* for load xml */
|
2000-07-31 21:29:14 +02:00
|
|
|
if (line_start.length() == 0)
|
|
|
|
|
{
|
|
|
|
|
line_start_ptr=0;
|
|
|
|
|
start_of_line= 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
line_start_ptr=(char*) line_start.ptr();
|
|
|
|
|
line_start_end=line_start_ptr+line_start.length();
|
|
|
|
|
start_of_line= 1;
|
|
|
|
|
}
|
|
|
|
|
/* If field_terminator == line_terminator, don't use line_terminator */
|
|
|
|
|
if (field_term_length == line_term_length &&
|
|
|
|
|
!memcmp(field_term_ptr,line_term_ptr,field_term_length))
|
|
|
|
|
{
|
|
|
|
|
line_term_length=0;
|
|
|
|
|
line_term_ptr=(char*) "";
|
|
|
|
|
}
|
|
|
|
|
enclosed_char= (enclosed_length=enclosed_par.length()) ?
|
|
|
|
|
(uchar) enclosed_par[0] : INT_MAX;
|
|
|
|
|
field_term_char= field_term_length ? (uchar) field_term_ptr[0] : INT_MAX;
|
|
|
|
|
line_term_char= line_term_length ? (uchar) line_term_ptr[0] : INT_MAX;
|
|
|
|
|
error=eof=found_end_of_line=found_null=line_cuted=0;
|
|
|
|
|
buff_length=tot_length;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Set of a stack for unget if long terminators */
|
|
|
|
|
uint length=max(field_term_length,line_term_length)+1;
|
|
|
|
|
set_if_bigger(length,line_start.length());
|
|
|
|
|
stack=stack_pos=(int*) sql_alloc(sizeof(int)*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 (!(buffer=(uchar*) my_malloc(buff_length+1,MYF(0))))
|
2000-07-31 21:29:14 +02:00
|
|
|
error=1; /* purecov: inspected */
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
end_of_buff=buffer+buff_length;
|
|
|
|
|
if (init_io_cache(&cache,(get_it_from_net) ? -1 : file, 0,
|
2000-09-25 23:33:25 +02:00
|
|
|
(get_it_from_net) ? READ_NET :
|
|
|
|
|
(is_fifo ? READ_FIFO : READ_CACHE),0L,1,
|
2000-07-31 21:29:14 +02:00
|
|
|
MYF(MY_WME)))
|
|
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
my_free((uchar*) buffer,MYF(0)); /* purecov: inspected */
|
2000-07-31 21:29:14 +02:00
|
|
|
error=1;
|
|
|
|
|
}
|
2005-01-27 22:38:56 +01:00
|
|
|
else
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2002-06-11 10:20:31 +02:00
|
|
|
/*
|
|
|
|
|
init_io_cache() will not initialize read_function member
|
2005-01-27 22:38:56 +01:00
|
|
|
if the cache is READ_NET. So we work around the problem with a
|
2002-06-11 10:20:31 +02:00
|
|
|
manual assignment
|
2001-10-23 21:28:03 +02:00
|
|
|
*/
|
2003-09-06 15:50:30 +02:00
|
|
|
need_end_io_cache = 1;
|
|
|
|
|
|
|
|
|
|
#ifndef EMBEDDED_LIBRARY
|
2001-10-23 21:28:03 +02:00
|
|
|
if (get_it_from_net)
|
|
|
|
|
cache.read_function = _my_b_net_read;
|
2001-12-06 13:10:51 +01:00
|
|
|
|
2006-02-26 00:03:52 +01:00
|
|
|
if (mysql_bin_log.is_open())
|
2001-08-03 23:57:53 +02:00
|
|
|
cache.pre_read = cache.pre_close =
|
2001-11-28 01:55:52 +01:00
|
|
|
(IO_CACHE_CALLBACK) log_loaded_block;
|
2002-12-16 14:33:29 +01:00
|
|
|
#endif
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
READ_INFO::~READ_INFO()
|
|
|
|
|
{
|
|
|
|
|
if (!error)
|
|
|
|
|
{
|
2001-08-03 23:57:53 +02:00
|
|
|
if (need_end_io_cache)
|
|
|
|
|
::end_io_cache(&cache);
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
my_free((uchar*) buffer,MYF(0));
|
2000-07-31 21:29:14 +02:00
|
|
|
error=1;
|
|
|
|
|
}
|
2009-10-12 08:22:53 +02:00
|
|
|
List_iterator<XML_TAG> xmlit(taglist);
|
|
|
|
|
XML_TAG *t;
|
|
|
|
|
while ((t= xmlit++))
|
|
|
|
|
delete(t);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#define GET (stack_pos != stack ? *--stack_pos : my_b_get(&cache))
|
|
|
|
|
#define PUSH(A) *(stack_pos++)=(A)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
inline int READ_INFO::terminator(char *ptr,uint length)
|
|
|
|
|
{
|
|
|
|
|
int chr=0; // Keep gcc happy
|
|
|
|
|
uint i;
|
|
|
|
|
for (i=1 ; i < length ; i++)
|
|
|
|
|
{
|
|
|
|
|
if ((chr=GET) != *++ptr)
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (i == length)
|
|
|
|
|
return 1;
|
|
|
|
|
PUSH(chr);
|
|
|
|
|
while (i-- > 1)
|
|
|
|
|
PUSH((uchar) *--ptr);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int READ_INFO::read_field()
|
|
|
|
|
{
|
|
|
|
|
int chr,found_enclosed_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
|
|
|
uchar *to,*new_buffer;
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
|
found_null=0;
|
|
|
|
|
if (found_end_of_line)
|
|
|
|
|
return 1; // One have to call next_line
|
|
|
|
|
|
2001-11-06 23:13:29 +01:00
|
|
|
/* Skip until we find 'line_start' */
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
|
if (start_of_line)
|
2001-11-06 23:13:29 +01:00
|
|
|
{ // Skip until line_start
|
2000-07-31 21:29:14 +02:00
|
|
|
start_of_line=0;
|
|
|
|
|
if (find_start_of_fields())
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
if ((chr=GET) == my_b_EOF)
|
|
|
|
|
{
|
|
|
|
|
found_end_of_line=eof=1;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
to=buffer;
|
|
|
|
|
if (chr == enclosed_char)
|
|
|
|
|
{
|
|
|
|
|
found_enclosed_char=enclosed_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
|
|
|
*to++=(uchar) chr; // If error
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
found_enclosed_char= INT_MAX;
|
|
|
|
|
PUSH(chr);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (;;)
|
|
|
|
|
{
|
|
|
|
|
while ( to < end_of_buff)
|
|
|
|
|
{
|
|
|
|
|
chr = GET;
|
|
|
|
|
#ifdef USE_MB
|
2003-12-06 19:05:26 +01:00
|
|
|
if ((my_mbcharlen(read_charset, chr) > 1) &&
|
2003-03-07 09:55:55 +01:00
|
|
|
to+my_mbcharlen(read_charset, chr) <= end_of_buff)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
|
uchar* p = (uchar*)to;
|
|
|
|
|
*to++ = chr;
|
2003-03-07 09:55:55 +01:00
|
|
|
int ml = my_mbcharlen(read_charset, chr);
|
2000-07-31 21:29:14 +02:00
|
|
|
int i;
|
|
|
|
|
for (i=1; i<ml; i++) {
|
|
|
|
|
chr = GET;
|
|
|
|
|
if (chr == my_b_EOF)
|
|
|
|
|
goto found_eof;
|
|
|
|
|
*to++ = chr;
|
|
|
|
|
}
|
2003-03-07 09:55:55 +01:00
|
|
|
if (my_ismbchar(read_charset,
|
2000-07-31 21:29:14 +02:00
|
|
|
(const char *)p,
|
|
|
|
|
(const char *)to))
|
|
|
|
|
continue;
|
|
|
|
|
for (i=0; i<ml; i++)
|
|
|
|
|
PUSH((uchar) *--to);
|
|
|
|
|
chr = GET;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
if (chr == my_b_EOF)
|
|
|
|
|
goto found_eof;
|
|
|
|
|
if (chr == escape_char)
|
|
|
|
|
{
|
|
|
|
|
if ((chr=GET) == my_b_EOF)
|
|
|
|
|
{
|
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
|
|
|
*to++= (uchar) escape_char;
|
2000-07-31 21:29:14 +02:00
|
|
|
goto found_eof;
|
|
|
|
|
}
|
2005-06-23 01:14:14 +02:00
|
|
|
/*
|
|
|
|
|
When escape_char == enclosed_char, we treat it like we do for
|
|
|
|
|
handling quotes in SQL parsing -- you can double-up the
|
|
|
|
|
escape_char to include it literally, but it doesn't do escapes
|
|
|
|
|
like \n. This allows: LOAD DATA ... ENCLOSED BY '"' ESCAPED BY '"'
|
|
|
|
|
with data like: "fie""ld1", "field2"
|
|
|
|
|
*/
|
|
|
|
|
if (escape_char != enclosed_char || chr == escape_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
|
|
|
*to++ = (uchar) unescape((char) chr);
|
2005-06-23 01:14:14 +02:00
|
|
|
continue;
|
|
|
|
|
}
|
2005-10-25 01:27:40 +02:00
|
|
|
PUSH(chr);
|
|
|
|
|
chr= escape_char;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
#ifdef ALLOW_LINESEPARATOR_IN_STRINGS
|
|
|
|
|
if (chr == line_term_char)
|
|
|
|
|
#else
|
|
|
|
|
if (chr == line_term_char && found_enclosed_char == INT_MAX)
|
|
|
|
|
#endif
|
|
|
|
|
{
|
|
|
|
|
if (terminator(line_term_ptr,line_term_length))
|
|
|
|
|
{ // Maybe unexpected linefeed
|
|
|
|
|
enclosed=0;
|
|
|
|
|
found_end_of_line=1;
|
|
|
|
|
row_start=buffer;
|
|
|
|
|
row_end= to;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (chr == found_enclosed_char)
|
|
|
|
|
{
|
|
|
|
|
if ((chr=GET) == found_enclosed_char)
|
|
|
|
|
{ // Remove dupplicated
|
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
|
|
|
*to++ = (uchar) chr;
|
2000-07-31 21:29:14 +02:00
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
// End of enclosed field if followed by field_term or line_term
|
|
|
|
|
if (chr == my_b_EOF ||
|
2009-06-10 16:04:07 +02:00
|
|
|
(chr == line_term_char && terminator(line_term_ptr,
|
|
|
|
|
line_term_length)))
|
2000-07-31 21:29:14 +02:00
|
|
|
{ // Maybe unexpected linefeed
|
|
|
|
|
enclosed=1;
|
|
|
|
|
found_end_of_line=1;
|
|
|
|
|
row_start=buffer+1;
|
|
|
|
|
row_end= to;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
if (chr == field_term_char &&
|
|
|
|
|
terminator(field_term_ptr,field_term_length))
|
|
|
|
|
{
|
|
|
|
|
enclosed=1;
|
|
|
|
|
row_start=buffer+1;
|
|
|
|
|
row_end= to;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2003-08-22 03:07:40 +02:00
|
|
|
/*
|
|
|
|
|
The string didn't terminate yet.
|
|
|
|
|
Store back next character for the loop
|
|
|
|
|
*/
|
2000-07-31 21:29:14 +02:00
|
|
|
PUSH(chr);
|
2003-08-22 03:07:40 +02:00
|
|
|
/* copy the found term character to 'to' */
|
|
|
|
|
chr= found_enclosed_char;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
else if (chr == field_term_char && found_enclosed_char == INT_MAX)
|
|
|
|
|
{
|
|
|
|
|
if (terminator(field_term_ptr,field_term_length))
|
|
|
|
|
{
|
|
|
|
|
enclosed=0;
|
|
|
|
|
row_start=buffer;
|
|
|
|
|
row_end= to;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
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
|
|
|
*to++ = (uchar) chr;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
/*
|
|
|
|
|
** We come here if buffer is too small. Enlarge it and continue
|
|
|
|
|
*/
|
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 (!(new_buffer=(uchar*) my_realloc((char*) buffer,buff_length+1+IO_SIZE,
|
2000-07-31 21:29:14 +02:00
|
|
|
MYF(MY_WME))))
|
|
|
|
|
return (error=1);
|
|
|
|
|
to=new_buffer + (to-buffer);
|
|
|
|
|
buffer=new_buffer;
|
|
|
|
|
buff_length+=IO_SIZE;
|
|
|
|
|
end_of_buff=buffer+buff_length;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
found_eof:
|
|
|
|
|
enclosed=0;
|
|
|
|
|
found_end_of_line=eof=1;
|
|
|
|
|
row_start=buffer;
|
|
|
|
|
row_end=to;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
2003-12-14 05:39:52 +01:00
|
|
|
Read a row with fixed length.
|
|
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
|
The row may not be fixed size on disk if there are escape
|
|
|
|
|
characters in the file.
|
|
|
|
|
|
|
|
|
|
IMPLEMENTATION NOTE
|
|
|
|
|
One can't use fixed length with multi-byte charset **
|
|
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
|
0 ok
|
|
|
|
|
1 error
|
2000-07-31 21:29:14 +02:00
|
|
|
*/
|
2001-12-06 13:10:51 +01:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
int READ_INFO::read_fixed_length()
|
|
|
|
|
{
|
|
|
|
|
int chr;
|
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 *to;
|
2000-07-31 21:29:14 +02:00
|
|
|
if (found_end_of_line)
|
|
|
|
|
return 1; // One have to call next_line
|
|
|
|
|
|
|
|
|
|
if (start_of_line)
|
2001-11-06 23:13:29 +01:00
|
|
|
{ // Skip until line_start
|
2000-07-31 21:29:14 +02:00
|
|
|
start_of_line=0;
|
|
|
|
|
if (find_start_of_fields())
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
to=row_start=buffer;
|
|
|
|
|
while (to < end_of_buff)
|
|
|
|
|
{
|
|
|
|
|
if ((chr=GET) == my_b_EOF)
|
|
|
|
|
goto found_eof;
|
|
|
|
|
if (chr == escape_char)
|
|
|
|
|
{
|
|
|
|
|
if ((chr=GET) == my_b_EOF)
|
|
|
|
|
{
|
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
|
|
|
*to++= (uchar) escape_char;
|
2000-07-31 21:29:14 +02:00
|
|
|
goto found_eof;
|
|
|
|
|
}
|
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
|
|
|
*to++ =(uchar) unescape((char) chr);
|
2000-07-31 21:29:14 +02:00
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (chr == line_term_char)
|
|
|
|
|
{
|
|
|
|
|
if (terminator(line_term_ptr,line_term_length))
|
|
|
|
|
{ // Maybe unexpected linefeed
|
|
|
|
|
found_end_of_line=1;
|
|
|
|
|
row_end= to;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
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
|
|
|
*to++ = (uchar) chr;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
row_end=to; // Found full line
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
found_eof:
|
|
|
|
|
found_end_of_line=eof=1;
|
|
|
|
|
row_start=buffer;
|
|
|
|
|
row_end=to;
|
|
|
|
|
return to == buffer ? 1 : 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int READ_INFO::next_line()
|
|
|
|
|
{
|
|
|
|
|
line_cuted=0;
|
|
|
|
|
start_of_line= line_start_ptr != 0;
|
|
|
|
|
if (found_end_of_line || eof)
|
|
|
|
|
{
|
|
|
|
|
found_end_of_line=0;
|
|
|
|
|
return eof;
|
|
|
|
|
}
|
|
|
|
|
found_end_of_line=0;
|
|
|
|
|
if (!line_term_length)
|
|
|
|
|
return 0; // No lines
|
|
|
|
|
for (;;)
|
|
|
|
|
{
|
|
|
|
|
int chr = GET;
|
|
|
|
|
#ifdef USE_MB
|
2003-12-06 19:05:26 +01:00
|
|
|
if (my_mbcharlen(read_charset, chr) > 1)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
for (uint i=1;
|
2003-03-07 09:55:55 +01:00
|
|
|
chr != my_b_EOF && i<my_mbcharlen(read_charset, chr);
|
2000-07-31 21:29:14 +02:00
|
|
|
i++)
|
|
|
|
|
chr = GET;
|
|
|
|
|
if (chr == escape_char)
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
if (chr == my_b_EOF)
|
|
|
|
|
{
|
|
|
|
|
eof=1;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
if (chr == escape_char)
|
|
|
|
|
{
|
|
|
|
|
line_cuted=1;
|
|
|
|
|
if (GET == my_b_EOF)
|
|
|
|
|
return 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (chr == line_term_char && terminator(line_term_ptr,line_term_length))
|
|
|
|
|
return 0;
|
|
|
|
|
line_cuted=1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bool READ_INFO::find_start_of_fields()
|
|
|
|
|
{
|
|
|
|
|
int chr;
|
|
|
|
|
try_again:
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
if ((chr=GET) == my_b_EOF)
|
|
|
|
|
{
|
|
|
|
|
found_end_of_line=eof=1;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
} while ((char) chr != line_start_ptr[0]);
|
|
|
|
|
for (char *ptr=line_start_ptr+1 ; ptr != line_start_end ; ptr++)
|
|
|
|
|
{
|
|
|
|
|
chr=GET; // Eof will be checked later
|
|
|
|
|
if ((char) chr != *ptr)
|
|
|
|
|
{ // Can't be line_start
|
|
|
|
|
PUSH(chr);
|
|
|
|
|
while (--ptr != line_start_ptr)
|
2004-05-05 11:31:17 +02:00
|
|
|
{ // Restart with next char
|
2000-07-31 21:29:14 +02:00
|
|
|
PUSH((uchar) *ptr);
|
|
|
|
|
}
|
|
|
|
|
goto try_again;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2009-10-12 08:22:53 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Clear taglist from tags with a specified level
|
|
|
|
|
*/
|
|
|
|
|
int READ_INFO::clear_level(int level)
|
|
|
|
|
{
|
|
|
|
|
DBUG_ENTER("READ_INFO::read_xml clear_level");
|
|
|
|
|
List_iterator<XML_TAG> xmlit(taglist);
|
|
|
|
|
xmlit.rewind();
|
|
|
|
|
XML_TAG *tag;
|
|
|
|
|
|
|
|
|
|
while ((tag= xmlit++))
|
|
|
|
|
{
|
|
|
|
|
if(tag->level >= level)
|
|
|
|
|
{
|
|
|
|
|
xmlit.remove();
|
|
|
|
|
delete tag;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Convert an XML entity to Unicode value.
|
|
|
|
|
Return -1 on error;
|
|
|
|
|
*/
|
|
|
|
|
static int
|
|
|
|
|
my_xml_entity_to_char(const char *name, uint length)
|
|
|
|
|
{
|
|
|
|
|
if (length == 2)
|
|
|
|
|
{
|
|
|
|
|
if (!memcmp(name, "gt", length))
|
|
|
|
|
return '>';
|
|
|
|
|
if (!memcmp(name, "lt", length))
|
|
|
|
|
return '<';
|
|
|
|
|
}
|
|
|
|
|
else if (length == 3)
|
|
|
|
|
{
|
|
|
|
|
if (!memcmp(name, "amp", length))
|
|
|
|
|
return '&';
|
|
|
|
|
}
|
|
|
|
|
else if (length == 4)
|
|
|
|
|
{
|
|
|
|
|
if (!memcmp(name, "quot", length))
|
|
|
|
|
return '"';
|
|
|
|
|
if (!memcmp(name, "apos", length))
|
|
|
|
|
return '\'';
|
|
|
|
|
}
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
@brief Convert newline, linefeed, tab to space
|
|
|
|
|
|
|
|
|
|
@param chr character
|
|
|
|
|
|
|
|
|
|
@details According to the "XML 1.0" standard,
|
|
|
|
|
only space (#x20) characters, carriage returns,
|
|
|
|
|
line feeds or tabs are considered as spaces.
|
|
|
|
|
Convert all of them to space (#x20) for parsing simplicity.
|
|
|
|
|
*/
|
|
|
|
|
static int
|
|
|
|
|
my_tospace(int chr)
|
|
|
|
|
{
|
|
|
|
|
return (chr == '\t' || chr == '\r' || chr == '\n') ? ' ' : chr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Read an xml value: handle multibyte and xml escape
|
|
|
|
|
*/
|
|
|
|
|
int READ_INFO::read_value(int delim, String *val)
|
|
|
|
|
{
|
|
|
|
|
int chr;
|
|
|
|
|
String tmp;
|
|
|
|
|
|
|
|
|
|
for (chr= GET; my_tospace(chr) != delim && chr != my_b_EOF;)
|
|
|
|
|
{
|
|
|
|
|
#ifdef USE_MB
|
|
|
|
|
if (my_mbcharlen(read_charset, chr) > 1)
|
|
|
|
|
{
|
|
|
|
|
DBUG_PRINT("read_xml",("multi byte"));
|
|
|
|
|
int i, ml= my_mbcharlen(read_charset, chr);
|
|
|
|
|
for (i= 1; i < ml; i++)
|
|
|
|
|
{
|
|
|
|
|
val->append(chr);
|
|
|
|
|
/*
|
|
|
|
|
Don't use my_tospace() in the middle of a multi-byte character
|
|
|
|
|
TODO: check that the multi-byte sequence is valid.
|
|
|
|
|
*/
|
|
|
|
|
chr= GET;
|
|
|
|
|
if (chr == my_b_EOF)
|
|
|
|
|
return chr;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
if(chr == '&')
|
|
|
|
|
{
|
|
|
|
|
tmp.length(0);
|
|
|
|
|
for (chr= my_tospace(GET) ; chr != ';' ; chr= my_tospace(GET))
|
|
|
|
|
{
|
|
|
|
|
if (chr == my_b_EOF)
|
|
|
|
|
return chr;
|
|
|
|
|
tmp.append(chr);
|
|
|
|
|
}
|
|
|
|
|
if ((chr= my_xml_entity_to_char(tmp.ptr(), tmp.length())) >= 0)
|
|
|
|
|
val->append(chr);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
val->append('&');
|
|
|
|
|
val->append(tmp);
|
|
|
|
|
val->append(';');
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
val->append(chr);
|
|
|
|
|
chr= GET;
|
|
|
|
|
}
|
|
|
|
|
return my_tospace(chr);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Read a record in xml format
|
|
|
|
|
tags and attributes are stored in taglist
|
|
|
|
|
when tag set in ROWS IDENTIFIED BY is closed, we are ready and return
|
|
|
|
|
*/
|
|
|
|
|
int READ_INFO::read_xml()
|
|
|
|
|
{
|
|
|
|
|
DBUG_ENTER("READ_INFO::read_xml");
|
|
|
|
|
int chr, chr2, chr3;
|
|
|
|
|
int delim= 0;
|
|
|
|
|
String tag, attribute, value;
|
|
|
|
|
bool in_tag= false;
|
|
|
|
|
|
|
|
|
|
tag.length(0);
|
|
|
|
|
attribute.length(0);
|
|
|
|
|
value.length(0);
|
|
|
|
|
|
|
|
|
|
for (chr= my_tospace(GET); chr != my_b_EOF ; )
|
|
|
|
|
{
|
|
|
|
|
switch(chr){
|
|
|
|
|
case '<': /* read tag */
|
|
|
|
|
/* TODO: check if this is a comment <!-- comment --> */
|
|
|
|
|
chr= my_tospace(GET);
|
|
|
|
|
if(chr == '!')
|
|
|
|
|
{
|
|
|
|
|
chr2= GET;
|
|
|
|
|
chr3= GET;
|
|
|
|
|
|
|
|
|
|
if(chr2 == '-' && chr3 == '-')
|
|
|
|
|
{
|
|
|
|
|
chr2= 0;
|
|
|
|
|
chr3= 0;
|
|
|
|
|
chr= my_tospace(GET);
|
|
|
|
|
|
|
|
|
|
while(chr != '>' || chr2 != '-' || chr3 != '-')
|
|
|
|
|
{
|
|
|
|
|
if(chr == '-')
|
|
|
|
|
{
|
|
|
|
|
chr3= chr2;
|
|
|
|
|
chr2= chr;
|
|
|
|
|
}
|
|
|
|
|
else if (chr2 == '-')
|
|
|
|
|
{
|
|
|
|
|
chr2= 0;
|
|
|
|
|
chr3= 0;
|
|
|
|
|
}
|
|
|
|
|
chr= my_tospace(GET);
|
|
|
|
|
if (chr == my_b_EOF)
|
|
|
|
|
goto found_eof;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
tag.length(0);
|
|
|
|
|
while(chr != '>' && chr != ' ' && chr != '/' && chr != my_b_EOF)
|
|
|
|
|
{
|
|
|
|
|
if(chr != delim) /* fix for the '<field name =' format */
|
|
|
|
|
tag.append(chr);
|
|
|
|
|
chr= my_tospace(GET);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// row tag should be in ROWS IDENTIFIED BY '<row>' - stored in line_term
|
|
|
|
|
if((tag.length() == line_term_length -2) &&
|
|
|
|
|
(strncmp(tag.c_ptr_safe(), line_term_ptr + 1, tag.length()) == 0))
|
|
|
|
|
{
|
|
|
|
|
DBUG_PRINT("read_xml", ("start-of-row: %i %s %s",
|
|
|
|
|
level,tag.c_ptr_safe(), line_term_ptr));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(chr == ' ' || chr == '>')
|
|
|
|
|
{
|
|
|
|
|
level++;
|
|
|
|
|
clear_level(level + 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (chr == ' ')
|
|
|
|
|
in_tag= true;
|
|
|
|
|
else
|
|
|
|
|
in_tag= false;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case ' ': /* read attribute */
|
|
|
|
|
while(chr == ' ') /* skip blanks */
|
|
|
|
|
chr= my_tospace(GET);
|
|
|
|
|
|
|
|
|
|
if(!in_tag)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
while(chr != '=' && chr != '/' && chr != '>' && chr != my_b_EOF)
|
|
|
|
|
{
|
|
|
|
|
attribute.append(chr);
|
|
|
|
|
chr= my_tospace(GET);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '>': /* end tag - read tag value */
|
|
|
|
|
in_tag= false;
|
|
|
|
|
chr= read_value('<', &value);
|
|
|
|
|
if(chr == my_b_EOF)
|
|
|
|
|
goto found_eof;
|
|
|
|
|
|
|
|
|
|
/* save value to list */
|
|
|
|
|
if(tag.length() > 0 && value.length() > 0)
|
|
|
|
|
{
|
|
|
|
|
DBUG_PRINT("read_xml", ("lev:%i tag:%s val:%s",
|
|
|
|
|
level,tag.c_ptr_safe(), value.c_ptr_safe()));
|
|
|
|
|
taglist.push_front( new XML_TAG(level, tag, value));
|
|
|
|
|
}
|
|
|
|
|
tag.length(0);
|
|
|
|
|
value.length(0);
|
|
|
|
|
attribute.length(0);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '/': /* close tag */
|
|
|
|
|
level--;
|
|
|
|
|
chr= my_tospace(GET);
|
|
|
|
|
if(chr != '>') /* if this is an empty tag <tag /> */
|
|
|
|
|
tag.length(0); /* we should keep tag value */
|
|
|
|
|
while(chr != '>' && chr != my_b_EOF)
|
|
|
|
|
{
|
|
|
|
|
tag.append(chr);
|
|
|
|
|
chr= my_tospace(GET);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if((tag.length() == line_term_length -2) &&
|
|
|
|
|
(strncmp(tag.c_ptr_safe(), line_term_ptr + 1, tag.length()) == 0))
|
|
|
|
|
{
|
|
|
|
|
DBUG_PRINT("read_xml", ("found end-of-row %i %s",
|
|
|
|
|
level, tag.c_ptr_safe()));
|
|
|
|
|
DBUG_RETURN(0); //normal return
|
|
|
|
|
}
|
|
|
|
|
chr= my_tospace(GET);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '=': /* attribute name end - read the value */
|
|
|
|
|
//check for tag field and attribute name
|
|
|
|
|
if(!memcmp(tag.c_ptr_safe(), STRING_WITH_LEN("field")) &&
|
|
|
|
|
!memcmp(attribute.c_ptr_safe(), STRING_WITH_LEN("name")))
|
|
|
|
|
{
|
|
|
|
|
/*
|
|
|
|
|
this is format <field name="xx">xx</field>
|
|
|
|
|
where actual fieldname is in attribute
|
|
|
|
|
*/
|
|
|
|
|
delim= my_tospace(GET);
|
|
|
|
|
tag.length(0);
|
|
|
|
|
attribute.length(0);
|
|
|
|
|
chr= '<'; /* we pretend that it is a tag */
|
|
|
|
|
level--;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//check for " or '
|
|
|
|
|
chr= GET;
|
|
|
|
|
if (chr == my_b_EOF)
|
|
|
|
|
goto found_eof;
|
|
|
|
|
if(chr == '"' || chr == '\'')
|
|
|
|
|
{
|
|
|
|
|
delim= chr;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
delim= ' '; /* no delimiter, use space */
|
|
|
|
|
PUSH(chr);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
chr= read_value(delim, &value);
|
|
|
|
|
if(attribute.length() > 0 && value.length() > 0)
|
|
|
|
|
{
|
|
|
|
|
DBUG_PRINT("read_xml", ("lev:%i att:%s val:%s\n",
|
|
|
|
|
level + 1,
|
|
|
|
|
attribute.c_ptr_safe(),
|
|
|
|
|
value.c_ptr_safe()));
|
|
|
|
|
taglist.push_front(new XML_TAG(level + 1, attribute, value));
|
|
|
|
|
}
|
|
|
|
|
attribute.length(0);
|
|
|
|
|
value.length(0);
|
|
|
|
|
if (chr != ' ')
|
|
|
|
|
chr= my_tospace(GET);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
chr= my_tospace(GET);
|
|
|
|
|
} /* end switch */
|
|
|
|
|
} /* end while */
|
|
|
|
|
|
|
|
|
|
found_eof:
|
|
|
|
|
DBUG_PRINT("read_xml",("Found eof"));
|
|
|
|
|
eof= 1;
|
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
}
|