2008-11-10 21:21:49 +01:00
|
|
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
2005-07-19 20:05:49 +02: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.
|
2005-07-19 20:05:49 +02: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.
|
2005-07-19 20:05:49 +02: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 */
|
|
|
|
|
|
|
|
|
2008-03-07 13:59:36 +01:00
|
|
|
#ifdef MYSQL_CLIENT
|
|
|
|
|
|
|
|
#include "mysql_priv.h"
|
|
|
|
|
|
|
|
#else
|
2005-06-02 02:43:32 +02:00
|
|
|
|
2005-05-26 12:09:14 +02:00
|
|
|
#ifdef USE_PRAGMA_IMPLEMENTATION
|
2000-07-31 21:29:14 +02:00
|
|
|
#pragma implementation // gcc: Class implementation
|
|
|
|
#endif
|
2005-06-05 19:38:52 +02:00
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
#include "mysql_priv.h"
|
2001-06-14 22:12:40 +02:00
|
|
|
#include "slave.h"
|
2007-04-12 08:58:04 +02:00
|
|
|
#include "rpl_rli.h"
|
|
|
|
#include "rpl_mi.h"
|
2005-03-21 22:09:42 +01:00
|
|
|
#include "rpl_filter.h"
|
2006-05-03 15:00:38 +02:00
|
|
|
#include "rpl_utility.h"
|
2007-04-13 14:55:28 +02:00
|
|
|
#include "rpl_record.h"
|
2001-10-03 21:55:31 +02:00
|
|
|
#include <my_dir.h>
|
2008-03-07 13:59:36 +01:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
#endif /* MYSQL_CLIENT */
|
2008-03-07 13:59:36 +01:00
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
#include <base64.h>
|
|
|
|
#include <my_bitmap.h>
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2003-01-29 14:31:20 +01:00
|
|
|
#define log_cs &my_charset_latin1
|
2002-12-19 06:38:29 +01:00
|
|
|
|
2007-04-12 08:58:04 +02:00
|
|
|
#define FLAGSTR(V,F) ((V)&(F)?#F" ":"")
|
|
|
|
|
2007-11-23 14:41:41 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
Size of buffer for printing a double in format %.<PREC>g
|
|
|
|
|
|
|
|
optional '-' + optional zero + '.' + PREC digits + 'e' + sign +
|
|
|
|
exponent digits + '\0'
|
|
|
|
*/
|
|
|
|
#define FMT_G_BUFSIZE(PREC) (3 + (PREC) + 5 + 1)
|
|
|
|
|
|
|
|
|
2007-12-13 09:32:23 +01:00
|
|
|
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
|
2009-02-04 12:08:27 +01:00
|
|
|
static int rows_event_stmt_cleanup(Relay_log_info const *rli, THD* thd);
|
|
|
|
|
2007-10-30 21:17:19 +01:00
|
|
|
static const char *HA_ERR(int i)
|
|
|
|
{
|
|
|
|
switch (i) {
|
|
|
|
case HA_ERR_KEY_NOT_FOUND: return "HA_ERR_KEY_NOT_FOUND";
|
|
|
|
case HA_ERR_FOUND_DUPP_KEY: return "HA_ERR_FOUND_DUPP_KEY";
|
|
|
|
case HA_ERR_RECORD_CHANGED: return "HA_ERR_RECORD_CHANGED";
|
|
|
|
case HA_ERR_WRONG_INDEX: return "HA_ERR_WRONG_INDEX";
|
|
|
|
case HA_ERR_CRASHED: return "HA_ERR_CRASHED";
|
|
|
|
case HA_ERR_WRONG_IN_RECORD: return "HA_ERR_WRONG_IN_RECORD";
|
|
|
|
case HA_ERR_OUT_OF_MEM: return "HA_ERR_OUT_OF_MEM";
|
|
|
|
case HA_ERR_NOT_A_TABLE: return "HA_ERR_NOT_A_TABLE";
|
|
|
|
case HA_ERR_WRONG_COMMAND: return "HA_ERR_WRONG_COMMAND";
|
|
|
|
case HA_ERR_OLD_FILE: return "HA_ERR_OLD_FILE";
|
|
|
|
case HA_ERR_NO_ACTIVE_RECORD: return "HA_ERR_NO_ACTIVE_RECORD";
|
|
|
|
case HA_ERR_RECORD_DELETED: return "HA_ERR_RECORD_DELETED";
|
|
|
|
case HA_ERR_RECORD_FILE_FULL: return "HA_ERR_RECORD_FILE_FULL";
|
|
|
|
case HA_ERR_INDEX_FILE_FULL: return "HA_ERR_INDEX_FILE_FULL";
|
|
|
|
case HA_ERR_END_OF_FILE: return "HA_ERR_END_OF_FILE";
|
|
|
|
case HA_ERR_UNSUPPORTED: return "HA_ERR_UNSUPPORTED";
|
|
|
|
case HA_ERR_TO_BIG_ROW: return "HA_ERR_TO_BIG_ROW";
|
|
|
|
case HA_WRONG_CREATE_OPTION: return "HA_WRONG_CREATE_OPTION";
|
|
|
|
case HA_ERR_FOUND_DUPP_UNIQUE: return "HA_ERR_FOUND_DUPP_UNIQUE";
|
|
|
|
case HA_ERR_UNKNOWN_CHARSET: return "HA_ERR_UNKNOWN_CHARSET";
|
|
|
|
case HA_ERR_WRONG_MRG_TABLE_DEF: return "HA_ERR_WRONG_MRG_TABLE_DEF";
|
|
|
|
case HA_ERR_CRASHED_ON_REPAIR: return "HA_ERR_CRASHED_ON_REPAIR";
|
|
|
|
case HA_ERR_CRASHED_ON_USAGE: return "HA_ERR_CRASHED_ON_USAGE";
|
|
|
|
case HA_ERR_LOCK_WAIT_TIMEOUT: return "HA_ERR_LOCK_WAIT_TIMEOUT";
|
|
|
|
case HA_ERR_LOCK_TABLE_FULL: return "HA_ERR_LOCK_TABLE_FULL";
|
|
|
|
case HA_ERR_READ_ONLY_TRANSACTION: return "HA_ERR_READ_ONLY_TRANSACTION";
|
|
|
|
case HA_ERR_LOCK_DEADLOCK: return "HA_ERR_LOCK_DEADLOCK";
|
|
|
|
case HA_ERR_CANNOT_ADD_FOREIGN: return "HA_ERR_CANNOT_ADD_FOREIGN";
|
|
|
|
case HA_ERR_NO_REFERENCED_ROW: return "HA_ERR_NO_REFERENCED_ROW";
|
|
|
|
case HA_ERR_ROW_IS_REFERENCED: return "HA_ERR_ROW_IS_REFERENCED";
|
|
|
|
case HA_ERR_NO_SAVEPOINT: return "HA_ERR_NO_SAVEPOINT";
|
|
|
|
case HA_ERR_NON_UNIQUE_BLOCK_SIZE: return "HA_ERR_NON_UNIQUE_BLOCK_SIZE";
|
|
|
|
case HA_ERR_NO_SUCH_TABLE: return "HA_ERR_NO_SUCH_TABLE";
|
|
|
|
case HA_ERR_TABLE_EXIST: return "HA_ERR_TABLE_EXIST";
|
|
|
|
case HA_ERR_NO_CONNECTION: return "HA_ERR_NO_CONNECTION";
|
|
|
|
case HA_ERR_NULL_IN_SPATIAL: return "HA_ERR_NULL_IN_SPATIAL";
|
|
|
|
case HA_ERR_TABLE_DEF_CHANGED: return "HA_ERR_TABLE_DEF_CHANGED";
|
|
|
|
case HA_ERR_NO_PARTITION_FOUND: return "HA_ERR_NO_PARTITION_FOUND";
|
|
|
|
case HA_ERR_RBR_LOGGING_FAILED: return "HA_ERR_RBR_LOGGING_FAILED";
|
|
|
|
case HA_ERR_DROP_INDEX_FK: return "HA_ERR_DROP_INDEX_FK";
|
|
|
|
case HA_ERR_FOREIGN_DUPLICATE_KEY: return "HA_ERR_FOREIGN_DUPLICATE_KEY";
|
|
|
|
case HA_ERR_TABLE_NEEDS_UPGRADE: return "HA_ERR_TABLE_NEEDS_UPGRADE";
|
|
|
|
case HA_ERR_TABLE_READONLY: return "HA_ERR_TABLE_READONLY";
|
|
|
|
case HA_ERR_AUTOINC_READ_FAILED: return "HA_ERR_AUTOINC_READ_FAILED";
|
|
|
|
case HA_ERR_AUTOINC_ERANGE: return "HA_ERR_AUTOINC_ERANGE";
|
|
|
|
case HA_ERR_GENERIC: return "HA_ERR_GENERIC";
|
|
|
|
case HA_ERR_RECORD_IS_THE_SAME: return "HA_ERR_RECORD_IS_THE_SAME";
|
|
|
|
case HA_ERR_LOGGING_IMPOSSIBLE: return "HA_ERR_LOGGING_IMPOSSIBLE";
|
|
|
|
case HA_ERR_CORRUPT_EVENT: return "HA_ERR_CORRUPT_EVENT";
|
2008-01-31 13:54:03 +01:00
|
|
|
case HA_ERR_ROWS_EVENT_APPLY : return "HA_ERR_ROWS_EVENT_APPLY";
|
2007-10-30 21:17:19 +01:00
|
|
|
}
|
2007-12-12 11:14:59 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2008-01-31 13:54:03 +01:00
|
|
|
Error reporting facility for Rows_log_event::do_apply_event
|
|
|
|
|
|
|
|
@param level error, warning or info
|
|
|
|
@param ha_error HA_ERR_ code
|
|
|
|
@param rli pointer to the active Relay_log_info instance
|
|
|
|
@param thd pointer to the slave thread's thd
|
|
|
|
@param table pointer to the event's table object
|
|
|
|
@param type the type of the event
|
|
|
|
@param log_name the master binlog file name
|
|
|
|
@param pos the master binlog file pos (the next after the event)
|
|
|
|
|
2007-12-12 11:14:59 +01:00
|
|
|
*/
|
|
|
|
static void inline slave_rows_error_report(enum loglevel level, int ha_error,
|
|
|
|
Relay_log_info const *rli, THD *thd,
|
|
|
|
TABLE *table, const char * type,
|
|
|
|
const char *log_name, ulong pos)
|
|
|
|
{
|
2008-01-31 13:54:03 +01:00
|
|
|
const char *handler_error= HA_ERR(ha_error);
|
|
|
|
char buff[MAX_SLAVE_ERRMSG], *slider;
|
|
|
|
const char *buff_end= buff + sizeof(buff);
|
|
|
|
uint len;
|
|
|
|
List_iterator_fast<MYSQL_ERROR> it(thd->warn_list);
|
|
|
|
MYSQL_ERROR *err;
|
|
|
|
buff[0]= 0;
|
|
|
|
|
|
|
|
for (err= it++, slider= buff; err && slider < buff_end - 1;
|
|
|
|
slider += len, err= it++)
|
|
|
|
{
|
|
|
|
len= my_snprintf(slider, buff_end - slider,
|
|
|
|
" %s, Error_code: %d;", err->msg, err->code);
|
|
|
|
}
|
|
|
|
|
2008-03-06 19:32:47 +01:00
|
|
|
rli->report(level, thd->is_error()? thd->main_da.sql_errno() : 0,
|
2007-12-12 11:14:59 +01:00
|
|
|
"Could not execute %s event on table %s.%s;"
|
2008-01-31 13:54:03 +01:00
|
|
|
"%s handler error %s; "
|
2007-12-12 11:14:59 +01:00
|
|
|
"the event's master log %s, end_log_pos %lu",
|
|
|
|
type, table->s->db.str,
|
|
|
|
table->s->table_name.str,
|
2008-01-31 13:54:03 +01:00
|
|
|
buff,
|
2007-12-12 11:14:59 +01:00
|
|
|
handler_error == NULL? "<unknown>" : handler_error,
|
|
|
|
log_name, pos);
|
2007-10-30 21:17:19 +01:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2006-10-06 10:17:02 +02:00
|
|
|
/*
|
|
|
|
Cache that will automatically be written to a dedicated file on
|
|
|
|
destruction.
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
|
|
|
|
*/
|
|
|
|
class Write_on_release_cache
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
enum flag
|
|
|
|
{
|
|
|
|
FLUSH_F
|
|
|
|
};
|
|
|
|
|
|
|
|
typedef unsigned short flag_set;
|
|
|
|
|
|
|
|
/*
|
|
|
|
Constructor.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
Write_on_release_cache
|
|
|
|
cache Pointer to cache to use
|
|
|
|
file File to write cache to upon destruction
|
|
|
|
flags Flags for the cache
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
|
|
|
|
Class used to guarantee copy of cache to file before exiting the
|
|
|
|
current block. On successful copy of the cache, the cache will
|
|
|
|
be reinited as a WRITE_CACHE.
|
|
|
|
|
|
|
|
Currently, a pointer to the cache is provided in the
|
|
|
|
constructor, but it would be possible to create a subclass
|
|
|
|
holding the IO_CACHE itself.
|
|
|
|
*/
|
|
|
|
Write_on_release_cache(IO_CACHE *cache, FILE *file, flag_set flags = 0)
|
|
|
|
: m_cache(cache), m_file(file), m_flags(flags)
|
|
|
|
{
|
|
|
|
reinit_io_cache(m_cache, WRITE_CACHE, 0L, FALSE, TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
~Write_on_release_cache()
|
|
|
|
{
|
2007-03-22 17:31:39 +01:00
|
|
|
copy_event_cache_to_file_and_reinit(m_cache, m_file);
|
2006-10-06 10:17:02 +02:00
|
|
|
if (m_flags | FLUSH_F)
|
|
|
|
fflush(m_file);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
Return a pointer to the internal IO_CACHE.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
operator&()
|
|
|
|
|
|
|
|
DESCRIPTION
|
2007-01-17 15:06:37 +01:00
|
|
|
|
|
|
|
Function to return a pointer to the internal cache, so that the
|
|
|
|
object can be treated as a IO_CACHE and used with the my_b_*
|
|
|
|
IO_CACHE functions
|
2006-10-06 10:17:02 +02:00
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
A pointer to the internal IO_CACHE.
|
|
|
|
*/
|
|
|
|
IO_CACHE *operator&()
|
|
|
|
{
|
|
|
|
return m_cache;
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
// Hidden, to prevent usage.
|
|
|
|
Write_on_release_cache(Write_on_release_cache const&);
|
|
|
|
|
|
|
|
IO_CACHE *m_cache;
|
|
|
|
FILE *m_file;
|
|
|
|
flag_set m_flags;
|
|
|
|
};
|
|
|
|
|
2007-10-04 17:46:31 +02:00
|
|
|
#ifndef DBUG_OFF
|
|
|
|
uint debug_not_change_ts_if_art_event= 1; // bug#29309 simulation
|
|
|
|
#endif
|
2006-10-06 10:17:02 +02:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
pretty_print_str()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2001-07-21 00:22:54 +02:00
|
|
|
#ifdef MYSQL_CLIENT
|
2008-01-30 14:12:40 +01:00
|
|
|
static void pretty_print_str(IO_CACHE* cache, const char* str, int len)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2008-01-30 14:12:40 +01:00
|
|
|
const char* end = str + len;
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(cache, "\'");
|
2001-08-19 04:22:20 +02:00
|
|
|
while (str < end)
|
|
|
|
{
|
2001-08-20 19:20:47 +02:00
|
|
|
char c;
|
2001-08-19 04:22:20 +02:00
|
|
|
switch ((c=*str++)) {
|
2006-10-06 10:17:02 +02:00
|
|
|
case '\n': my_b_printf(cache, "\\n"); break;
|
|
|
|
case '\r': my_b_printf(cache, "\\r"); break;
|
|
|
|
case '\\': my_b_printf(cache, "\\\\"); break;
|
|
|
|
case '\b': my_b_printf(cache, "\\b"); break;
|
|
|
|
case '\t': my_b_printf(cache, "\\t"); break;
|
|
|
|
case '\'': my_b_printf(cache, "\\'"); break;
|
|
|
|
case 0 : my_b_printf(cache, "\\0"); break;
|
2001-08-19 04:22:20 +02:00
|
|
|
default:
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(cache, "%c", c);
|
2001-08-19 04:22:20 +02:00
|
|
|
break;
|
|
|
|
}
|
2000-11-15 22:00:06 +01:00
|
|
|
}
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(cache, "\'");
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2003-08-11 21:44:43 +02:00
|
|
|
#endif /* MYSQL_CLIENT */
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2004-03-16 21:41:30 +01:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2001-06-21 21:19:24 +02:00
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
static void clear_all_errors(THD *thd, Relay_log_info *rli)
|
2004-03-11 17:38:19 +01:00
|
|
|
{
|
2007-10-19 23:20:38 +02:00
|
|
|
thd->is_slave_error = 0;
|
2004-03-11 17:38:19 +01:00
|
|
|
thd->clear_error();
|
2007-06-09 07:19:37 +02:00
|
|
|
rli->clear_error();
|
2004-03-11 17:38:19 +01:00
|
|
|
}
|
|
|
|
|
2004-03-16 21:41:30 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
Ignore error code specified on command line.
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2002-01-22 23:05:11 +01:00
|
|
|
inline int ignored_error_code(int err_code)
|
|
|
|
{
|
2006-01-12 19:51:02 +01:00
|
|
|
#ifdef HAVE_NDB_BINLOG
|
|
|
|
/*
|
|
|
|
The following error codes are hard-coded and will always be ignored.
|
|
|
|
*/
|
|
|
|
switch (err_code)
|
|
|
|
{
|
|
|
|
case ER_DB_CREATE_EXISTS:
|
|
|
|
case ER_DB_DROP_EXISTS:
|
|
|
|
return 1;
|
|
|
|
default:
|
|
|
|
/* Nothing to do */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
#endif
|
2003-07-08 15:50:57 +02:00
|
|
|
return ((err_code == ER_SLAVE_IGNORED_TABLE) ||
|
|
|
|
(use_slave_mask && bitmap_is_set(&slave_error_mask, err_code)));
|
2002-01-22 23:05:11 +01:00
|
|
|
}
|
2003-01-15 09:11:44 +01:00
|
|
|
#endif
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2001-08-04 13:48:58 +02:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
pretty_print_str()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2001-08-04 13:48:58 +02:00
|
|
|
|
2004-04-05 12:56:05 +02:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2008-01-30 14:12:40 +01:00
|
|
|
static char *pretty_print_str(char *packet, const char *str, int len)
|
2001-06-21 21:19:24 +02:00
|
|
|
{
|
2008-01-30 14:12:40 +01:00
|
|
|
const char *end= str + len;
|
2003-08-11 21:44:43 +02:00
|
|
|
char *pos= packet;
|
2003-01-17 13:39:29 +01:00
|
|
|
*pos++= '\'';
|
2001-08-19 04:22:20 +02:00
|
|
|
while (str < end)
|
|
|
|
{
|
|
|
|
char c;
|
2002-06-11 10:20:31 +02:00
|
|
|
switch ((c=*str++)) {
|
2003-08-18 23:08:08 +02:00
|
|
|
case '\n': *pos++= '\\'; *pos++= 'n'; break;
|
|
|
|
case '\r': *pos++= '\\'; *pos++= 'r'; break;
|
|
|
|
case '\\': *pos++= '\\'; *pos++= '\\'; break;
|
|
|
|
case '\b': *pos++= '\\'; *pos++= 'b'; break;
|
|
|
|
case '\t': *pos++= '\\'; *pos++= 't'; break;
|
|
|
|
case '\'': *pos++= '\\'; *pos++= '\''; break;
|
|
|
|
case 0 : *pos++= '\\'; *pos++= '0'; break;
|
2001-08-19 04:22:20 +02:00
|
|
|
default:
|
2003-08-11 21:44:43 +02:00
|
|
|
*pos++= c;
|
2001-08-19 04:22:20 +02:00
|
|
|
break;
|
|
|
|
}
|
2001-06-21 21:19:24 +02:00
|
|
|
}
|
2003-01-17 13:39:29 +01:00
|
|
|
*pos++= '\'';
|
|
|
|
return pos;
|
2001-06-21 21:19:24 +02:00
|
|
|
}
|
2003-05-19 15:35:49 +02:00
|
|
|
#endif /* !MYSQL_CLIENT */
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2001-06-21 21:19:24 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2006-01-05 23:47:49 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
Creates a temporary name for load data infile:.
|
2006-01-05 23:47:49 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@param buf Store new filename here
|
|
|
|
@param file_id File_id (part of file name)
|
|
|
|
@param event_server_id Event_id (part of file name)
|
|
|
|
@param ext Extension for file name
|
2006-01-05 23:47:49 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@return
|
2006-01-05 23:47:49 +01:00
|
|
|
Pointer to start of extension
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-01-29 17:32:16 +01:00
|
|
|
|
2006-01-05 23:47:49 +01:00
|
|
|
static char *slave_load_file_stem(char *buf, uint file_id,
|
|
|
|
int event_server_id, const char *ext)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2006-01-05 23:47:49 +01:00
|
|
|
char *res;
|
2009-02-21 10:36:07 +01:00
|
|
|
fn_format(buf,PREFIX_SQL_LOAD,slave_load_tmpdir, "", MY_UNPACK_FILENAME);
|
2005-10-06 16:54:43 +02:00
|
|
|
to_unix_path(buf);
|
|
|
|
|
2001-08-03 23:57:53 +02:00
|
|
|
buf = strend(buf);
|
|
|
|
buf = int10_to_str(::server_id, buf, 10);
|
|
|
|
*buf++ = '-';
|
|
|
|
buf = int10_to_str(event_server_id, buf, 10);
|
|
|
|
*buf++ = '-';
|
2006-01-05 23:47:49 +01:00
|
|
|
res= int10_to_str(file_id, buf, 10);
|
|
|
|
strmov(res, ext); // Add extension last
|
|
|
|
return res; // Pointer to extension
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
2003-01-15 09:11:44 +01:00
|
|
|
#endif
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2003-08-11 21:44:43 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
Delete all temporary files used for SQL_LOAD.
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
static void cleanup_load_tmpdir()
|
|
|
|
{
|
|
|
|
MY_DIR *dirp;
|
|
|
|
FILEINFO *file;
|
|
|
|
uint i;
|
2003-10-07 14:42:26 +02:00
|
|
|
char fname[FN_REFLEN], prefbuf[31], *p;
|
2003-08-11 21:44:43 +02:00
|
|
|
|
2009-03-18 11:31:17 +01:00
|
|
|
if (!(dirp=my_dir(slave_load_tmpdir,MYF(0))))
|
2002-10-30 07:50:07 +01:00
|
|
|
return;
|
|
|
|
|
2003-09-24 23:25:19 +02:00
|
|
|
/*
|
|
|
|
When we are deleting temporary files, we should only remove
|
|
|
|
the files associated with the server id of our server.
|
|
|
|
We don't use event_server_id here because since we've disabled
|
|
|
|
direct binlogging of Create_file/Append_file/Exec_load events
|
|
|
|
we cannot meet Start_log event in the middle of events from one
|
|
|
|
LOAD DATA.
|
|
|
|
*/
|
2009-02-21 10:36:07 +01:00
|
|
|
p= strmake(prefbuf, STRING_WITH_LEN(PREFIX_SQL_LOAD));
|
2003-09-24 23:25:19 +02:00
|
|
|
p= int10_to_str(::server_id, p, 10);
|
|
|
|
*(p++)= '-';
|
|
|
|
*p= 0;
|
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
for (i=0 ; i < (uint)dirp->number_off_files; i++)
|
|
|
|
{
|
|
|
|
file=dirp->dir_entry+i;
|
2003-09-24 23:25:19 +02:00
|
|
|
if (is_prefix(file->name, prefbuf))
|
2003-08-11 21:44:43 +02:00
|
|
|
{
|
|
|
|
fn_format(fname,file->name,slave_load_tmpdir,"",MY_UNPACK_FILENAME);
|
|
|
|
my_delete(fname, MYF(0));
|
|
|
|
}
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
my_dirend(dirp);
|
|
|
|
}
|
2003-01-15 09:11:44 +01:00
|
|
|
#endif
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
write_str()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2008-01-30 14:12:40 +01:00
|
|
|
static bool write_str(IO_CACHE *file, const char *str, uint length)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar tmp[1];
|
|
|
|
tmp[0]= (uchar) length;
|
2004-11-12 04:01:46 +01:00
|
|
|
return (my_b_safe_write(file, tmp, sizeof(tmp)) ||
|
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_b_safe_write(file, (uchar*) str, length));
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
read_str()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
static inline int read_str(const char **buf, const char *buf_end,
|
|
|
|
const char **str, uint8 *len)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
if (*buf + ((uint) (uchar) **buf) >= buf_end)
|
2002-10-30 07:50:07 +01:00
|
|
|
return 1;
|
2004-11-12 04:01:46 +01:00
|
|
|
*len= (uint8) **buf;
|
|
|
|
*str= (*buf)+1;
|
|
|
|
(*buf)+= (uint) *len+1;
|
2002-10-30 07:50:07 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
2004-06-08 19:55:04 +02:00
|
|
|
Transforms a string into "" or its expression in 0x... form.
|
|
|
|
*/
|
2005-10-11 23:58:22 +02:00
|
|
|
|
2005-08-19 20:49:34 +02:00
|
|
|
char *str_to_hex(char *to, const char *from, uint len)
|
2004-06-08 19:55:04 +02:00
|
|
|
{
|
|
|
|
if (len)
|
|
|
|
{
|
2005-10-11 23:58:22 +02:00
|
|
|
*to++= '0';
|
|
|
|
*to++= 'x';
|
|
|
|
to= octet2hex(to, from, len);
|
2004-06-08 19:55:04 +02:00
|
|
|
}
|
|
|
|
else
|
2005-10-11 23:58:22 +02:00
|
|
|
to= strmov(to, "\"\"");
|
|
|
|
return to; // pointer to end 0 of 'to'
|
2004-06-08 19:55:04 +02:00
|
|
|
}
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
#ifndef MYSQL_CLIENT
|
|
|
|
|
|
|
|
/**
|
2006-03-21 14:35:49 +01:00
|
|
|
Append a version of the 'from' string suitable for use in a query to
|
|
|
|
the 'to' string. To generate a correct escaping, the character set
|
|
|
|
information in 'csinfo' is used.
|
2007-10-11 19:29:09 +02:00
|
|
|
*/
|
|
|
|
|
2006-03-21 14:35:49 +01:00
|
|
|
int
|
|
|
|
append_query_string(CHARSET_INFO *csinfo,
|
|
|
|
String const *from, String *to)
|
|
|
|
{
|
|
|
|
char *beg, *ptr;
|
|
|
|
uint32 const orig_len= to->length();
|
|
|
|
if (to->reserve(orig_len + from->length()*2+3))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
beg= to->c_ptr_quick() + to->length();
|
|
|
|
ptr= beg;
|
|
|
|
if (csinfo->escape_with_backslash_is_dangerous)
|
|
|
|
ptr= str_to_hex(ptr, from->ptr(), from->length());
|
|
|
|
else
|
|
|
|
{
|
|
|
|
*ptr++= '\'';
|
2006-11-09 11:27:34 +01:00
|
|
|
ptr+= escape_string_for_mysql(csinfo, ptr, 0,
|
2006-03-21 14:35:49 +01:00
|
|
|
from->ptr(), from->length());
|
|
|
|
*ptr++='\'';
|
|
|
|
}
|
|
|
|
to->length(orig_len + ptr - beg);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2006-12-14 23:51:37 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
2004-11-12 04:01:46 +01:00
|
|
|
Prints a "session_var=value" string. Used by mysqlbinlog to print some SET
|
|
|
|
commands just before it prints a query.
|
|
|
|
*/
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
#ifdef MYSQL_CLIENT
|
2006-12-14 23:51:37 +01:00
|
|
|
|
2006-10-06 10:17:02 +02:00
|
|
|
static void print_set_option(IO_CACHE* file, uint32 bits_changed,
|
|
|
|
uint32 option, uint32 flags, const char* name,
|
|
|
|
bool* need_comma)
|
2004-11-12 04:01:46 +01:00
|
|
|
{
|
|
|
|
if (bits_changed & option)
|
|
|
|
{
|
|
|
|
if (*need_comma)
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(file,", ");
|
|
|
|
my_b_printf(file,"%s=%d", name, test(flags & option));
|
2004-11-12 04:01:46 +01:00
|
|
|
*need_comma= 1;
|
|
|
|
}
|
|
|
|
}
|
2005-12-22 06:39:02 +01:00
|
|
|
#endif
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-21 20:39:58 +02:00
|
|
|
/**************************************************************************
|
2004-11-12 04:01:46 +01:00
|
|
|
Log_event methods (= the parent class of all events)
|
2003-05-21 20:39:58 +02:00
|
|
|
**************************************************************************/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
@return
|
|
|
|
returns the human readable name of the event's type
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
BUG#32407: Impossible to do point-in-time recovery from older binlog
Problem: it is unsafe to read base64-printed events without first
reading the Format_description_log_event (FD). Currently, mysqlbinlog
cannot print the FD.
As a side effect, another bug has also been fixed: When mysqlbinlog
--start-position=X was specified, no ROLLBACK was printed. I changed
this, so that ROLLBACK is always printed.
This patch does several things:
- Format_description_log_event (FD) now print themselves in base64
format.
- mysqlbinlog is now able to print FD events. It has three modes:
--base64-output=auto Print row events in base64 output, and print
FD event. The FD event is printed even if
it is outside the range specified with
--start-position, because it would not be
safe to read row events otherwise. This is
the default.
--base64-output=always Like --base64-output=auto, but also print
base64 output for query events. This is
like the old --base64-output flag, which
is also a shorthand for
--base64-output=always
--base64-output=never Never print base64 output, generate error if
row events occur in binlog. This is
useful to suppress the FD event in binlogs
known not to contain row events (e.g.,
because BINLOG statement is unsafe,
requires root privileges, is not SQL, etc)
- the BINLOG statement now handles FD events correctly, by setting
the thread's rli's relay log's description_event_for_exec to the
loaded event.
In fact, executing a BINLOG statement is almost the same as reading
an event from a relay log. Before my patch, the code for this was
separated (exec_relay_log_event in slave.cc executes events from
the relay log, mysql_client_binlog_statement in sql_binlog.cc
executes BINLOG statements). I needed to augment
mysql_client_binlog_statement to do parts of what
exec_relay_log_event does. Hence, I did a small refactoring and
moved parts of exec_relay_log_event to a new function, which I
named apply_event_and_update_pos. apply_event_and_update_pos is
called both from exec_relay_log_event and from
mysql_client_binlog_statement.
- When a non-FD event is executed in a BINLOG statement, without
previously executing a FD event in a BINLOG statement, it generates
an error, because that's unsafe. I took a new error code for that:
ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENTS.
In order to get a decent error message containing the name of the
event, I added the class method char*
Log_event::get_type_str(Log_event_type type), which returns a
string name for the given Log_event_type. This is just like the
existing char* Log_event::get_type_str(), except it is a class
method that takes the log event type as parameter.
I also added PRE_GA_*_ROWS_LOG_EVENT to Log_event::get_type_str(),
so that names of old rows event are properly printed.
- When reading an event, I added a check that the event type is known
by the current Format_description_log_event. Without this, it may
crash on bad input (and I was struck by this several times).
- I patched the following test cases, which all contain BINLOG
statements for row events which must be preceded by BINLOG
statements for FD events:
- rpl_bug31076
While I was here, I fixed some small things in log_event.cc:
- replaced hard-coded 4 by EVENT_TYPE_OFFSET in 3 places
- replaced return by DBUG_VOID_RETURN in one place
- The name of the logfile can be '-' to indicate stdin. Before my
patch, the code just checked if the first character is '-'; now it
does a full strcmp(). Probably, all arguments that begin with a -
are already handled somewhere else as flags, but I still think it
is better that the code reflects what it is supposed to do, with as
little dependencies as possible on other parts of the code. If we
one day implement that all command line arguments after -- are
files (as most unix tools do), then we need this.
I also fixed the following in slave.cc:
- next_event() was declared twice, and queue_event was not static but
should be static (not used outside the file).
2007-12-14 19:02:02 +01:00
|
|
|
const char* Log_event::get_type_str(Log_event_type type)
|
2001-06-21 21:19:24 +02:00
|
|
|
{
|
BUG#32407: Impossible to do point-in-time recovery from older binlog
Problem: it is unsafe to read base64-printed events without first
reading the Format_description_log_event (FD). Currently, mysqlbinlog
cannot print the FD.
As a side effect, another bug has also been fixed: When mysqlbinlog
--start-position=X was specified, no ROLLBACK was printed. I changed
this, so that ROLLBACK is always printed.
This patch does several things:
- Format_description_log_event (FD) now print themselves in base64
format.
- mysqlbinlog is now able to print FD events. It has three modes:
--base64-output=auto Print row events in base64 output, and print
FD event. The FD event is printed even if
it is outside the range specified with
--start-position, because it would not be
safe to read row events otherwise. This is
the default.
--base64-output=always Like --base64-output=auto, but also print
base64 output for query events. This is
like the old --base64-output flag, which
is also a shorthand for
--base64-output=always
--base64-output=never Never print base64 output, generate error if
row events occur in binlog. This is
useful to suppress the FD event in binlogs
known not to contain row events (e.g.,
because BINLOG statement is unsafe,
requires root privileges, is not SQL, etc)
- the BINLOG statement now handles FD events correctly, by setting
the thread's rli's relay log's description_event_for_exec to the
loaded event.
In fact, executing a BINLOG statement is almost the same as reading
an event from a relay log. Before my patch, the code for this was
separated (exec_relay_log_event in slave.cc executes events from
the relay log, mysql_client_binlog_statement in sql_binlog.cc
executes BINLOG statements). I needed to augment
mysql_client_binlog_statement to do parts of what
exec_relay_log_event does. Hence, I did a small refactoring and
moved parts of exec_relay_log_event to a new function, which I
named apply_event_and_update_pos. apply_event_and_update_pos is
called both from exec_relay_log_event and from
mysql_client_binlog_statement.
- When a non-FD event is executed in a BINLOG statement, without
previously executing a FD event in a BINLOG statement, it generates
an error, because that's unsafe. I took a new error code for that:
ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENTS.
In order to get a decent error message containing the name of the
event, I added the class method char*
Log_event::get_type_str(Log_event_type type), which returns a
string name for the given Log_event_type. This is just like the
existing char* Log_event::get_type_str(), except it is a class
method that takes the log event type as parameter.
I also added PRE_GA_*_ROWS_LOG_EVENT to Log_event::get_type_str(),
so that names of old rows event are properly printed.
- When reading an event, I added a check that the event type is known
by the current Format_description_log_event. Without this, it may
crash on bad input (and I was struck by this several times).
- I patched the following test cases, which all contain BINLOG
statements for row events which must be preceded by BINLOG
statements for FD events:
- rpl_bug31076
While I was here, I fixed some small things in log_event.cc:
- replaced hard-coded 4 by EVENT_TYPE_OFFSET in 3 places
- replaced return by DBUG_VOID_RETURN in one place
- The name of the logfile can be '-' to indicate stdin. Before my
patch, the code just checked if the first character is '-'; now it
does a full strcmp(). Probably, all arguments that begin with a -
are already handled somewhere else as flags, but I still think it
is better that the code reflects what it is supposed to do, with as
little dependencies as possible on other parts of the code. If we
one day implement that all command line arguments after -- are
files (as most unix tools do), then we need this.
I also fixed the following in slave.cc:
- next_event() was declared twice, and queue_event was not static but
should be static (not used outside the file).
2007-12-14 19:02:02 +01:00
|
|
|
switch(type) {
|
2004-11-12 04:01:46 +01:00
|
|
|
case START_EVENT_V3: return "Start_v3";
|
2001-06-21 21:19:24 +02:00
|
|
|
case STOP_EVENT: return "Stop";
|
|
|
|
case QUERY_EVENT: return "Query";
|
|
|
|
case ROTATE_EVENT: return "Rotate";
|
|
|
|
case INTVAR_EVENT: return "Intvar";
|
|
|
|
case LOAD_EVENT: return "Load";
|
2001-08-19 04:22:20 +02:00
|
|
|
case NEW_LOAD_EVENT: return "New_load";
|
2001-06-21 21:19:24 +02:00
|
|
|
case SLAVE_EVENT: return "Slave";
|
2001-08-03 23:57:53 +02:00
|
|
|
case CREATE_FILE_EVENT: return "Create_file";
|
|
|
|
case APPEND_BLOCK_EVENT: return "Append_block";
|
|
|
|
case DELETE_FILE_EVENT: return "Delete_file";
|
|
|
|
case EXEC_LOAD_EVENT: return "Exec_load";
|
2002-10-25 04:20:37 +02:00
|
|
|
case RAND_EVENT: return "RAND";
|
2005-01-16 13:16:23 +01:00
|
|
|
case XID_EVENT: return "Xid";
|
2003-01-30 18:39:54 +01:00
|
|
|
case USER_VAR_EVENT: return "User var";
|
2004-11-12 04:01:46 +01:00
|
|
|
case FORMAT_DESCRIPTION_EVENT: return "Format_desc";
|
2005-12-22 06:39:02 +01:00
|
|
|
case TABLE_MAP_EVENT: return "Table_map";
|
2007-12-05 20:00:14 +01:00
|
|
|
case PRE_GA_WRITE_ROWS_EVENT: return "Write_rows_event_old";
|
|
|
|
case PRE_GA_UPDATE_ROWS_EVENT: return "Update_rows_event_old";
|
|
|
|
case PRE_GA_DELETE_ROWS_EVENT: return "Delete_rows_event_old";
|
2005-12-22 06:39:02 +01:00
|
|
|
case WRITE_ROWS_EVENT: return "Write_rows";
|
|
|
|
case UPDATE_ROWS_EVENT: return "Update_rows";
|
|
|
|
case DELETE_ROWS_EVENT: return "Delete_rows";
|
2005-03-16 02:32:47 +01:00
|
|
|
case BEGIN_LOAD_QUERY_EVENT: return "Begin_load_query";
|
|
|
|
case EXECUTE_LOAD_QUERY_EVENT: return "Execute_load_query";
|
2007-03-29 20:31:09 +02:00
|
|
|
case INCIDENT_EVENT: return "Incident";
|
2005-01-16 13:16:23 +01:00
|
|
|
default: return "Unknown"; /* impossible */
|
2001-06-21 21:19:24 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
BUG#32407: Impossible to do point-in-time recovery from older binlog
Problem: it is unsafe to read base64-printed events without first
reading the Format_description_log_event (FD). Currently, mysqlbinlog
cannot print the FD.
As a side effect, another bug has also been fixed: When mysqlbinlog
--start-position=X was specified, no ROLLBACK was printed. I changed
this, so that ROLLBACK is always printed.
This patch does several things:
- Format_description_log_event (FD) now print themselves in base64
format.
- mysqlbinlog is now able to print FD events. It has three modes:
--base64-output=auto Print row events in base64 output, and print
FD event. The FD event is printed even if
it is outside the range specified with
--start-position, because it would not be
safe to read row events otherwise. This is
the default.
--base64-output=always Like --base64-output=auto, but also print
base64 output for query events. This is
like the old --base64-output flag, which
is also a shorthand for
--base64-output=always
--base64-output=never Never print base64 output, generate error if
row events occur in binlog. This is
useful to suppress the FD event in binlogs
known not to contain row events (e.g.,
because BINLOG statement is unsafe,
requires root privileges, is not SQL, etc)
- the BINLOG statement now handles FD events correctly, by setting
the thread's rli's relay log's description_event_for_exec to the
loaded event.
In fact, executing a BINLOG statement is almost the same as reading
an event from a relay log. Before my patch, the code for this was
separated (exec_relay_log_event in slave.cc executes events from
the relay log, mysql_client_binlog_statement in sql_binlog.cc
executes BINLOG statements). I needed to augment
mysql_client_binlog_statement to do parts of what
exec_relay_log_event does. Hence, I did a small refactoring and
moved parts of exec_relay_log_event to a new function, which I
named apply_event_and_update_pos. apply_event_and_update_pos is
called both from exec_relay_log_event and from
mysql_client_binlog_statement.
- When a non-FD event is executed in a BINLOG statement, without
previously executing a FD event in a BINLOG statement, it generates
an error, because that's unsafe. I took a new error code for that:
ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENTS.
In order to get a decent error message containing the name of the
event, I added the class method char*
Log_event::get_type_str(Log_event_type type), which returns a
string name for the given Log_event_type. This is just like the
existing char* Log_event::get_type_str(), except it is a class
method that takes the log event type as parameter.
I also added PRE_GA_*_ROWS_LOG_EVENT to Log_event::get_type_str(),
so that names of old rows event are properly printed.
- When reading an event, I added a check that the event type is known
by the current Format_description_log_event. Without this, it may
crash on bad input (and I was struck by this several times).
- I patched the following test cases, which all contain BINLOG
statements for row events which must be preceded by BINLOG
statements for FD events:
- rpl_bug31076
While I was here, I fixed some small things in log_event.cc:
- replaced hard-coded 4 by EVENT_TYPE_OFFSET in 3 places
- replaced return by DBUG_VOID_RETURN in one place
- The name of the logfile can be '-' to indicate stdin. Before my
patch, the code just checked if the first character is '-'; now it
does a full strcmp(). Probably, all arguments that begin with a -
are already handled somewhere else as flags, but I still think it
is better that the code reflects what it is supposed to do, with as
little dependencies as possible on other parts of the code. If we
one day implement that all command line arguments after -- are
files (as most unix tools do), then we need this.
I also fixed the following in slave.cc:
- next_event() was declared twice, and queue_event was not static but
should be static (not used outside the file).
2007-12-14 19:02:02 +01:00
|
|
|
const char* Log_event::get_type_str()
|
|
|
|
{
|
|
|
|
return get_type_str(get_type_code());
|
|
|
|
}
|
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Log_event::Log_event()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2001-06-21 21:19:24 +02:00
|
|
|
#ifndef MYSQL_CLIENT
|
2002-11-07 03:02:37 +01:00
|
|
|
Log_event::Log_event(THD* thd_arg, uint16 flags_arg, bool using_trans)
|
2004-11-12 04:01:46 +01:00
|
|
|
:log_pos(0), temp_buf(0), exec_time(0), flags(flags_arg), thd(thd_arg)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2002-11-21 14:56:48 +01:00
|
|
|
server_id= thd->server_id;
|
|
|
|
when= thd->start_time;
|
2005-01-16 13:16:23 +01:00
|
|
|
cache_stmt= using_trans;
|
2002-11-07 03:02:37 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
2005-02-09 20:04:28 +01:00
|
|
|
This minimal constructor is for when you are not even sure that there
|
|
|
|
is a valid THD. For example in the server when we are shutting down or
|
|
|
|
flushing logs after receiving a SIGHUP (then we must write a Rotate to
|
|
|
|
the binlog but we have no THD, so we need this minimal constructor).
|
2003-12-17 16:35:34 +01:00
|
|
|
*/
|
|
|
|
|
2002-11-07 03:02:37 +01:00
|
|
|
Log_event::Log_event()
|
2004-11-12 04:01:46 +01:00
|
|
|
:temp_buf(0), exec_time(0), flags(0), cache_stmt(0),
|
2002-11-07 03:02:37 +01:00
|
|
|
thd(0)
|
|
|
|
{
|
2002-11-21 14:56:48 +01:00
|
|
|
server_id= ::server_id;
|
2007-08-13 15:11:25 +02:00
|
|
|
/*
|
|
|
|
We can't call my_time() here as this would cause a call before
|
|
|
|
my_init() is called
|
|
|
|
*/
|
|
|
|
when= 0;
|
2002-11-21 14:56:48 +01:00
|
|
|
log_pos= 0;
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
2003-05-19 15:35:49 +02:00
|
|
|
#endif /* !MYSQL_CLIENT */
|
2001-10-03 21:55:31 +02:00
|
|
|
|
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Log_event::Log_event()
|
2002-08-08 02:12:02 +02:00
|
|
|
*/
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
Log_event::Log_event(const char* buf,
|
2005-01-27 22:38:56 +01:00
|
|
|
const Format_description_log_event* description_event)
|
2004-11-12 04:01:46 +01:00
|
|
|
:temp_buf(0), cache_stmt(0)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
#ifndef MYSQL_CLIENT
|
|
|
|
thd = 0;
|
2005-01-27 22:38:56 +01:00
|
|
|
#endif
|
2001-08-03 23:57:53 +02:00
|
|
|
when = uint4korr(buf);
|
|
|
|
server_id = uint4korr(buf + SERVER_ID_OFFSET);
|
2008-02-22 16:07:07 +01:00
|
|
|
data_written= uint4korr(buf + EVENT_LEN_OFFSET);
|
2004-11-12 04:01:46 +01:00
|
|
|
if (description_event->binlog_version==1)
|
2001-11-11 06:24:12 +01:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
log_pos= 0;
|
|
|
|
flags= 0;
|
|
|
|
return;
|
2001-11-11 06:24:12 +01:00
|
|
|
}
|
2004-11-12 04:01:46 +01:00
|
|
|
/* 4.0 or newer */
|
|
|
|
log_pos= uint4korr(buf + LOG_POS_OFFSET);
|
|
|
|
/*
|
2005-02-09 20:04:28 +01:00
|
|
|
If the log is 4.0 (so here it can only be a 4.0 relay log read by
|
|
|
|
the SQL thread or a 4.0 master binlog read by the I/O thread),
|
|
|
|
log_pos is the beginning of the event: we transform it into the end
|
|
|
|
of the event, which is more useful.
|
|
|
|
But how do you know that the log is 4.0: you know it if
|
|
|
|
description_event is version 3 *and* you are not reading a
|
|
|
|
Format_desc (remember that mysqlbinlog starts by assuming that 5.0
|
|
|
|
logs are in 4.0 format, until it finds a Format_desc).
|
2004-11-12 04:01:46 +01:00
|
|
|
*/
|
|
|
|
if (description_event->binlog_version==3 &&
|
|
|
|
buf[EVENT_TYPE_OFFSET]<FORMAT_DESCRIPTION_EVENT && log_pos)
|
2001-11-11 06:24:12 +01:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
/*
|
|
|
|
If log_pos=0, don't change it. log_pos==0 is a marker to mean
|
|
|
|
"don't change rli->group_master_log_pos" (see
|
2005-02-09 20:04:28 +01:00
|
|
|
inc_group_relay_log_pos()). As it is unreal log_pos, adding the
|
|
|
|
event len's is nonsense. For example, a fake Rotate event should
|
2004-11-12 04:01:46 +01:00
|
|
|
not have its log_pos (which is 0) changed or it will modify
|
2005-02-09 20:04:28 +01:00
|
|
|
Exec_master_log_pos in SHOW SLAVE STATUS, displaying a nonsense
|
|
|
|
value of (a non-zero offset which does not exist in the master's
|
|
|
|
binlog, so which will cause problems if the user uses this value
|
|
|
|
in CHANGE MASTER).
|
2004-11-12 04:01:46 +01:00
|
|
|
*/
|
2008-03-18 13:38:12 +01:00
|
|
|
log_pos+= data_written; /* purecov: inspected */
|
2001-11-11 06:24:12 +01:00
|
|
|
}
|
2004-11-12 04:01:46 +01:00
|
|
|
DBUG_PRINT("info", ("log_pos: %lu", (ulong) log_pos));
|
|
|
|
|
|
|
|
flags= uint2korr(buf + FLAGS_OFFSET);
|
|
|
|
if ((buf[EVENT_TYPE_OFFSET] == FORMAT_DESCRIPTION_EVENT) ||
|
|
|
|
(buf[EVENT_TYPE_OFFSET] == ROTATE_EVENT))
|
|
|
|
{
|
|
|
|
/*
|
2005-02-09 20:04:28 +01:00
|
|
|
These events always have a header which stops here (i.e. their
|
|
|
|
header is FROZEN).
|
2004-11-12 04:01:46 +01:00
|
|
|
*/
|
|
|
|
/*
|
2005-02-09 20:04:28 +01:00
|
|
|
Initialization to zero of all other Log_event members as they're
|
|
|
|
not specified. Currently there are no such members; in the future
|
|
|
|
there will be an event UID (but Format_description and Rotate
|
|
|
|
don't need this UID, as they are not propagated through
|
|
|
|
--log-slave-updates (remember the UID is used to not play a query
|
|
|
|
twice when you have two masters which are slaves of a 3rd master).
|
|
|
|
Then we are done.
|
2004-11-12 04:01:46 +01:00
|
|
|
*/
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
/* otherwise, go on with reading the header from buf (nothing now) */
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifndef MYSQL_CLIENT
|
2003-01-15 09:11:44 +01:00
|
|
|
#ifdef HAVE_REPLICATION
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
int Log_event::do_update_pos(Relay_log_info *rli)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2003-01-08 10:24:39 +01:00
|
|
|
/*
|
2006-11-01 15:35:37 +01:00
|
|
|
rli is null when (as far as I (Guilhem) know) the caller is
|
2006-11-10 15:10:41 +01:00
|
|
|
Load_log_event::do_apply_event *and* that one is called from
|
|
|
|
Execute_load_log_event::do_apply_event. In this case, we don't
|
|
|
|
do anything here ; Execute_load_log_event::do_apply_event will
|
|
|
|
call Log_event::do_apply_event again later with the proper rli.
|
2006-11-01 15:35:37 +01:00
|
|
|
Strictly speaking, if we were sure that rli is null only in the
|
|
|
|
case discussed above, 'if (rli)' is useless here. But as we are
|
|
|
|
not 100% sure, keep it for now.
|
2006-11-10 15:10:41 +01:00
|
|
|
|
|
|
|
Matz: I don't think we will need this check with this refactoring.
|
2003-01-08 10:24:39 +01:00
|
|
|
*/
|
2005-02-17 13:52:16 +01:00
|
|
|
if (rli)
|
2007-10-13 22:12:50 +02:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
bug#29309 simulation: resetting the flag to force
|
|
|
|
wrong behaviour of artificial event to update
|
|
|
|
rli->last_master_timestamp for only one time -
|
|
|
|
the first FLUSH LOGS in the test.
|
|
|
|
*/
|
|
|
|
DBUG_EXECUTE_IF("let_first_flush_log_change_timestamp",
|
|
|
|
if (debug_not_change_ts_if_art_event == 1
|
|
|
|
&& is_artificial_event())
|
|
|
|
{
|
|
|
|
debug_not_change_ts_if_art_event= 0;
|
|
|
|
});
|
|
|
|
#ifndef DBUG_OFF
|
|
|
|
rli->stmt_done(log_pos,
|
|
|
|
is_artificial_event() &&
|
|
|
|
debug_not_change_ts_if_art_event > 0 ? 0 : when);
|
|
|
|
#else
|
|
|
|
rli->stmt_done(log_pos, is_artificial_event()? 0 : when);
|
|
|
|
#endif
|
|
|
|
DBUG_EXECUTE_IF("let_first_flush_log_change_timestamp",
|
|
|
|
if (debug_not_change_ts_if_art_event == 0)
|
|
|
|
{
|
|
|
|
debug_not_change_ts_if_art_event= 2;
|
|
|
|
});
|
|
|
|
}
|
2006-11-10 15:10:41 +01:00
|
|
|
return 0; // Cannot fail currently
|
|
|
|
}
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2007-01-17 15:06:37 +01:00
|
|
|
|
|
|
|
Log_event::enum_skip_reason
|
2007-08-16 07:37:50 +02:00
|
|
|
Log_event::do_shall_skip(Relay_log_info *rli)
|
2007-03-22 08:32:41 +01:00
|
|
|
{
|
|
|
|
DBUG_PRINT("info", ("ev->server_id=%lu, ::server_id=%lu,"
|
|
|
|
" rli->replicate_same_server_id=%d,"
|
|
|
|
" rli->slave_skip_counter=%d",
|
|
|
|
(ulong) server_id, (ulong) ::server_id,
|
|
|
|
rli->replicate_same_server_id,
|
|
|
|
rli->slave_skip_counter));
|
2007-10-19 14:18:41 +02:00
|
|
|
if (server_id == ::server_id && !rli->replicate_same_server_id ||
|
|
|
|
rli->slave_skip_counter == 1 && rli->is_in_group())
|
2007-03-22 08:32:41 +01:00
|
|
|
return EVENT_SKIP_IGNORE;
|
2007-01-17 15:06:37 +01:00
|
|
|
else if (rli->slave_skip_counter > 0)
|
|
|
|
return EVENT_SKIP_COUNT;
|
|
|
|
else
|
2007-03-22 08:32:41 +01:00
|
|
|
return EVENT_SKIP_NOT;
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
2001-06-21 21:19:24 +02:00
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Log_event::pack_info()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2002-12-11 08:17:51 +01:00
|
|
|
void Log_event::pack_info(Protocol *protocol)
|
2001-06-21 21:19:24 +02:00
|
|
|
{
|
2003-03-21 21:08:56 +01:00
|
|
|
protocol->store("", &my_charset_bin);
|
2001-06-21 21:19:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
2002-10-30 07:50:07 +01:00
|
|
|
Only called by SHOW BINLOG EVENTS
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-12-11 08:17:51 +01:00
|
|
|
int Log_event::net_send(Protocol *protocol, const char* log_name, my_off_t pos)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
2002-11-21 14:56:48 +01:00
|
|
|
const char *p= strrchr(log_name, FN_LIBCHAR);
|
|
|
|
const char *event_type;
|
2002-10-30 07:50:07 +01:00
|
|
|
if (p)
|
|
|
|
log_name = p + 1;
|
2007-08-17 00:10:46 +02:00
|
|
|
|
2002-12-11 08:17:51 +01:00
|
|
|
protocol->prepare_for_resend();
|
2003-03-18 08:34:19 +01:00
|
|
|
protocol->store(log_name, &my_charset_bin);
|
2002-12-11 08:17:51 +01:00
|
|
|
protocol->store((ulonglong) pos);
|
2002-10-30 07:50:07 +01:00
|
|
|
event_type = get_type_str();
|
2003-03-18 08:34:19 +01:00
|
|
|
protocol->store(event_type, strlen(event_type), &my_charset_bin);
|
2002-12-11 08:17:51 +01:00
|
|
|
protocol->store((uint32) server_id);
|
|
|
|
protocol->store((ulonglong) log_pos);
|
|
|
|
pack_info(protocol);
|
|
|
|
return protocol->write();
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
2003-01-15 09:11:44 +01:00
|
|
|
#endif /* HAVE_REPLICATION */
|
|
|
|
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
init_show_field_list() prepares the column names and types for the
|
|
|
|
output of SHOW BINLOG EVENTS; it is used only by SHOW BINLOG
|
|
|
|
EVENTS.
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2003-01-15 09:11:44 +01:00
|
|
|
|
|
|
|
void Log_event::init_show_field_list(List<Item>* field_list)
|
|
|
|
{
|
|
|
|
field_list->push_back(new Item_empty_string("Log_name", 20));
|
2007-03-09 06:05:08 +01:00
|
|
|
field_list->push_back(new Item_return_int("Pos", MY_INT32_NUM_DECIMAL_DIGITS,
|
2003-01-15 09:11:44 +01:00
|
|
|
MYSQL_TYPE_LONGLONG));
|
|
|
|
field_list->push_back(new Item_empty_string("Event_type", 20));
|
|
|
|
field_list->push_back(new Item_return_int("Server_id", 10,
|
|
|
|
MYSQL_TYPE_LONG));
|
2007-03-09 06:05:08 +01:00
|
|
|
field_list->push_back(new Item_return_int("End_log_pos",
|
|
|
|
MY_INT32_NUM_DECIMAL_DIGITS,
|
2003-01-15 09:11:44 +01:00
|
|
|
MYSQL_TYPE_LONGLONG));
|
|
|
|
field_list->push_back(new Item_empty_string("Info", 20));
|
|
|
|
}
|
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Log_event::write()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
bool Log_event::write_header(IO_CACHE* file, ulong event_data_length)
|
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
|
|
|
uchar header[LOG_EVENT_HEADER_LEN];
|
2007-08-13 15:11:25 +02:00
|
|
|
ulong now;
|
2004-11-12 04:01:46 +01:00
|
|
|
DBUG_ENTER("Log_event::write_header");
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
/* Store number of bytes that will be written by this event */
|
|
|
|
data_written= event_data_length + sizeof(header);
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
/*
|
|
|
|
log_pos != 0 if this is relay-log event. In this case we should not
|
|
|
|
change the position
|
|
|
|
*/
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
if (is_artificial_event())
|
|
|
|
{
|
|
|
|
/*
|
2008-09-28 09:34:25 +02:00
|
|
|
Artificial events are automatically generated and do not exist
|
|
|
|
in master's binary log, so log_pos should be set to 0.
|
2004-11-12 04:01:46 +01:00
|
|
|
*/
|
|
|
|
log_pos= 0;
|
|
|
|
}
|
|
|
|
else if (!log_pos)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Calculate position of end of event
|
|
|
|
|
|
|
|
Note that with a SEQ_READ_APPEND cache, my_b_tell() does not
|
|
|
|
work well. So this will give slightly wrong positions for the
|
|
|
|
Format_desc/Rotate/Stop events which the slave writes to its
|
|
|
|
relay log. For example, the initial Format_desc will have
|
|
|
|
end_log_pos=91 instead of 95. Because after writing the first 4
|
|
|
|
bytes of the relay log, my_b_tell() still reports 0. Because
|
|
|
|
my_b_append() does not update the counter which my_b_tell()
|
|
|
|
later uses (one should probably use my_b_append_tell() to work
|
|
|
|
around this). To get right positions even when writing to the
|
|
|
|
relay log, we use the (new) my_b_safe_tell().
|
|
|
|
|
|
|
|
Note that this raises a question on the correctness of all these
|
|
|
|
DBUG_ASSERT(my_b_tell()=rli->event_relay_log_pos).
|
|
|
|
|
|
|
|
If in a transaction, the log_pos which we calculate below is not
|
|
|
|
very good (because then my_b_safe_tell() returns start position
|
|
|
|
of the BEGIN, so it's like the statement was at the BEGIN's
|
|
|
|
place), but it's not a very serious problem (as the slave, when
|
|
|
|
it is in a transaction, does not take those end_log_pos into
|
|
|
|
account (as it calls inc_event_relay_log_pos()). To be fixed
|
|
|
|
later, so that it looks less strange. But not bug.
|
|
|
|
*/
|
|
|
|
|
|
|
|
log_pos= my_b_safe_tell(file)+data_written;
|
|
|
|
}
|
|
|
|
|
2007-08-16 15:47:31 +02:00
|
|
|
now= (ulong) get_time(); // Query start time
|
2007-08-13 15:11:25 +02:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
/*
|
|
|
|
Header will be of size LOG_EVENT_HEADER_LEN for all events, except for
|
|
|
|
FORMAT_DESCRIPTION_EVENT and ROTATE_EVENT, where it will be
|
|
|
|
LOG_EVENT_MINIMAL_HEADER_LEN (remember these 2 have a frozen header,
|
|
|
|
because we read them before knowing the format).
|
|
|
|
*/
|
|
|
|
|
2007-08-13 15:11:25 +02:00
|
|
|
int4store(header, now); // timestamp
|
2004-11-12 04:01:46 +01:00
|
|
|
header[EVENT_TYPE_OFFSET]= get_type_code();
|
|
|
|
int4store(header+ SERVER_ID_OFFSET, server_id);
|
|
|
|
int4store(header+ EVENT_LEN_OFFSET, data_written);
|
|
|
|
int4store(header+ LOG_POS_OFFSET, log_pos);
|
|
|
|
int2store(header+ FLAGS_OFFSET, flags);
|
|
|
|
|
|
|
|
DBUG_RETURN(my_b_safe_write(file, header, sizeof(header)) != 0);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
2004-11-12 04:01:46 +01:00
|
|
|
This needn't be format-tolerant, because we only read
|
|
|
|
LOG_EVENT_MINIMAL_HEADER_LEN (we just want to read the event's length).
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2000-11-15 22:00:06 +01:00
|
|
|
int Log_event::read_log_event(IO_CACHE* file, String* packet,
|
2000-10-04 03:53:13 +02:00
|
|
|
pthread_mutex_t* log_lock)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
ulong data_len;
|
2002-06-11 10:20:31 +02:00
|
|
|
int result=0;
|
2004-11-12 04:01:46 +01:00
|
|
|
char buf[LOG_EVENT_MINIMAL_HEADER_LEN];
|
2007-01-17 15:06:37 +01:00
|
|
|
DBUG_ENTER("Log_event::read_log_event");
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2000-11-15 22:00:06 +01:00
|
|
|
if (log_lock)
|
2000-10-04 03:53:13 +02:00
|
|
|
pthread_mutex_lock(log_lock);
|
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 (my_b_read(file, (uchar*) buf, sizeof(buf)))
|
2000-11-15 22:00:06 +01:00
|
|
|
{
|
2002-06-11 10:20:31 +02:00
|
|
|
/*
|
|
|
|
If the read hits eof, we must report it as eof so the caller
|
|
|
|
will know it can go into cond_wait to be woken up on the next
|
|
|
|
update to the log.
|
|
|
|
*/
|
2002-08-21 21:04:22 +02:00
|
|
|
DBUG_PRINT("error",("file->error: %d", file->error));
|
2002-06-11 10:20:31 +02:00
|
|
|
if (!file->error)
|
|
|
|
result= LOG_READ_EOF;
|
|
|
|
else
|
2002-08-21 21:04:22 +02:00
|
|
|
result= (file->error > 0 ? LOG_READ_TRUNC : LOG_READ_IO);
|
2002-06-11 10:20:31 +02:00
|
|
|
goto end;
|
2000-11-15 22:00:06 +01:00
|
|
|
}
|
2002-06-11 10:20:31 +02:00
|
|
|
data_len= uint4korr(buf + EVENT_LEN_OFFSET);
|
2004-11-12 04:01:46 +01:00
|
|
|
if (data_len < LOG_EVENT_MINIMAL_HEADER_LEN ||
|
2002-07-23 17:31:22 +02:00
|
|
|
data_len > current_thd->variables.max_allowed_packet)
|
2000-11-15 22:00:06 +01:00
|
|
|
{
|
2002-08-21 21:04:22 +02:00
|
|
|
DBUG_PRINT("error",("data_len: %ld", data_len));
|
2004-11-12 04:01:46 +01:00
|
|
|
result= ((data_len < LOG_EVENT_MINIMAL_HEADER_LEN) ? LOG_READ_BOGUS :
|
2002-06-11 10:20:31 +02:00
|
|
|
LOG_READ_TOO_LARGE);
|
|
|
|
goto end;
|
2000-11-15 22:00:06 +01:00
|
|
|
}
|
2007-03-23 19:00:34 +01:00
|
|
|
|
|
|
|
/* Append the log event header to packet */
|
|
|
|
if (packet->append(buf, sizeof(buf)))
|
|
|
|
{
|
|
|
|
/* Failed to allocate packet */
|
|
|
|
result= LOG_READ_MEM;
|
|
|
|
goto end;
|
|
|
|
}
|
2004-11-12 04:01:46 +01:00
|
|
|
data_len-= LOG_EVENT_MINIMAL_HEADER_LEN;
|
2000-11-15 22:00:06 +01:00
|
|
|
if (data_len)
|
|
|
|
{
|
2007-03-23 19:00:34 +01:00
|
|
|
/* Append rest of event, read directly from file into packet */
|
2000-11-15 22:00:06 +01:00
|
|
|
if (packet->append(file, data_len))
|
2000-10-04 03:53:13 +02:00
|
|
|
{
|
2002-06-11 10:20:31 +02:00
|
|
|
/*
|
2007-03-23 19:00:34 +01:00
|
|
|
Fatal error occured when appending rest of the event
|
|
|
|
to packet, possible failures:
|
|
|
|
1. EOF occured when reading from file, it's really an error
|
|
|
|
as data_len is >=0 there's supposed to be more bytes available.
|
|
|
|
file->error will have been set to number of bytes left to read
|
|
|
|
2. Read was interrupted, file->error would normally be set to -1
|
|
|
|
3. Failed to allocate memory for packet, my_errno
|
|
|
|
will be ENOMEM(file->error shuold be 0, but since the
|
|
|
|
memory allocation occurs before the call to read it might
|
|
|
|
be uninitialized)
|
2002-06-11 10:20:31 +02:00
|
|
|
*/
|
2007-03-23 19:00:34 +01:00
|
|
|
result= (my_errno == ENOMEM ? LOG_READ_MEM :
|
|
|
|
(file->error >= 0 ? LOG_READ_TRUNC: LOG_READ_IO));
|
2002-06-11 10:20:31 +02:00
|
|
|
/* Implicit goto end; */
|
2000-10-04 03:53:13 +02:00
|
|
|
}
|
2000-11-15 22:00:06 +01:00
|
|
|
}
|
2002-06-11 10:20:31 +02:00
|
|
|
|
|
|
|
end:
|
|
|
|
if (log_lock)
|
|
|
|
pthread_mutex_unlock(log_lock);
|
2002-08-21 21:04:22 +02:00
|
|
|
DBUG_RETURN(result);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2003-08-11 21:44:43 +02:00
|
|
|
#endif /* !MYSQL_CLIENT */
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2001-08-10 02:16:43 +02:00
|
|
|
#ifndef MYSQL_CLIENT
|
2002-06-05 22:04:38 +02:00
|
|
|
#define UNLOCK_MUTEX if (log_lock) pthread_mutex_unlock(log_lock);
|
|
|
|
#define LOCK_MUTEX if (log_lock) pthread_mutex_lock(log_lock);
|
2001-11-11 06:24:12 +01:00
|
|
|
#else
|
2002-06-11 10:20:31 +02:00
|
|
|
#define UNLOCK_MUTEX
|
2001-11-11 06:24:12 +01:00
|
|
|
#define LOCK_MUTEX
|
|
|
|
#endif
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
#ifndef MYSQL_CLIENT
|
|
|
|
/**
|
|
|
|
@note
|
2004-11-12 04:01:46 +01:00
|
|
|
Allocates memory; The caller is responsible for clean-up.
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2001-11-11 06:24:12 +01:00
|
|
|
Log_event* Log_event::read_log_event(IO_CACHE* file,
|
|
|
|
pthread_mutex_t* log_lock,
|
2007-08-14 14:20:05 +02:00
|
|
|
const Format_description_log_event
|
|
|
|
*description_event)
|
2001-08-10 02:16:43 +02:00
|
|
|
#else
|
2004-11-12 04:01:46 +01:00
|
|
|
Log_event* Log_event::read_log_event(IO_CACHE* file,
|
2007-08-14 14:20:05 +02:00
|
|
|
const Format_description_log_event
|
|
|
|
*description_event)
|
2005-01-16 13:16:23 +01:00
|
|
|
#endif
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2007-01-17 15:06:37 +01:00
|
|
|
DBUG_ENTER("Log_event::read_log_event");
|
2005-02-25 15:53:22 +01:00
|
|
|
DBUG_ASSERT(description_event != 0);
|
2004-11-12 04:01:46 +01:00
|
|
|
char head[LOG_EVENT_MINIMAL_HEADER_LEN];
|
|
|
|
/*
|
|
|
|
First we only want to read at most LOG_EVENT_MINIMAL_HEADER_LEN, just to
|
|
|
|
check the event for sanity and to know its length; no need to really parse
|
|
|
|
it. We say "at most" because this could be a 3.23 master, which has header
|
2005-01-16 13:16:23 +01:00
|
|
|
of 13 bytes, whereas LOG_EVENT_MINIMAL_HEADER_LEN is 19 bytes (it's
|
|
|
|
"minimal" over the set {MySQL >=4.0}).
|
2004-11-12 04:01:46 +01:00
|
|
|
*/
|
|
|
|
uint header_size= min(description_event->common_header_len,
|
|
|
|
LOG_EVENT_MINIMAL_HEADER_LEN);
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2001-11-11 06:24:12 +01:00
|
|
|
LOCK_MUTEX;
|
2006-11-20 21:42:06 +01:00
|
|
|
DBUG_PRINT("info", ("my_b_tell: %lu", (ulong) my_b_tell(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
|
|
|
if (my_b_read(file, (uchar *) head, header_size))
|
2000-11-15 22:00:06 +01:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
DBUG_PRINT("info", ("Log_event::read_log_event(IO_CACHE*,Format_desc*) \
|
|
|
|
failed my_b_read"));
|
2001-08-10 03:16:15 +02:00
|
|
|
UNLOCK_MUTEX;
|
2004-11-12 04:01:46 +01:00
|
|
|
/*
|
2005-02-09 20:04:28 +01:00
|
|
|
No error here; it could be that we are at the file's end. However
|
|
|
|
if the next my_b_read() fails (below), it will be an error as we
|
|
|
|
were able to read the first bytes.
|
2004-11-12 04:01:46 +01:00
|
|
|
*/
|
2005-02-09 20:04:28 +01:00
|
|
|
DBUG_RETURN(0);
|
2001-06-14 22:12:40 +02:00
|
|
|
}
|
2001-06-19 23:03:48 +02:00
|
|
|
uint data_len = uint4korr(head + EVENT_LEN_OFFSET);
|
2002-06-11 10:20:31 +02:00
|
|
|
char *buf= 0;
|
|
|
|
const char *error= 0;
|
|
|
|
Log_event *res= 0;
|
2005-01-16 13:16:23 +01:00
|
|
|
#ifndef max_allowed_packet
|
|
|
|
THD *thd=current_thd;
|
2005-06-08 03:23:58 +02:00
|
|
|
uint max_allowed_packet= thd ? thd->variables.max_allowed_packet : ~(ulong)0;
|
2005-01-16 13:16:23 +01:00
|
|
|
#endif
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2001-06-19 23:03:48 +02:00
|
|
|
if (data_len > max_allowed_packet)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2001-06-19 23:03:48 +02:00
|
|
|
error = "Event too big";
|
|
|
|
goto err;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
2001-11-18 01:23:46 +01:00
|
|
|
if (data_len < header_size)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2001-06-19 23:03:48 +02:00
|
|
|
error = "Event too small";
|
|
|
|
goto err;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2001-08-19 04:22:20 +02:00
|
|
|
|
|
|
|
// some events use the extra byte to null-terminate strings
|
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 (!(buf = (char*) my_malloc(data_len+1, MYF(MY_WME))))
|
2001-06-19 23:03:48 +02:00
|
|
|
{
|
|
|
|
error = "Out of memory";
|
|
|
|
goto err;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2001-08-19 04:22:20 +02:00
|
|
|
buf[data_len] = 0;
|
2001-11-18 01:23:46 +01:00
|
|
|
memcpy(buf, head, header_size);
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (my_b_read(file, (uchar*) buf + header_size, data_len - header_size))
|
2001-06-19 23:03:48 +02:00
|
|
|
{
|
|
|
|
error = "read error";
|
|
|
|
goto err;
|
|
|
|
}
|
2005-01-16 13:16:23 +01:00
|
|
|
if ((res= read_log_event(buf, data_len, &error, description_event)))
|
2001-08-03 23:57:53 +02:00
|
|
|
res->register_temp_buf(buf);
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2001-06-19 23:03:48 +02:00
|
|
|
err:
|
2001-08-10 03:16:15 +02:00
|
|
|
UNLOCK_MUTEX;
|
2005-02-09 20:04:28 +01:00
|
|
|
if (!res)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2005-02-25 15:53:22 +01:00
|
|
|
DBUG_ASSERT(error != 0);
|
2005-02-09 20:04:28 +01:00
|
|
|
sql_print_error("Error in Log_event::read_log_event(): "
|
|
|
|
"'%s', data_len: %d, event_type: %d",
|
2003-08-07 19:16:37 +02:00
|
|
|
error,data_len,head[EVENT_TYPE_OFFSET]);
|
2001-08-03 23:57:53 +02:00
|
|
|
my_free(buf, MYF(MY_ALLOW_ZERO_PTR));
|
2003-03-02 00:34:44 +01:00
|
|
|
/*
|
|
|
|
The SQL slave thread will check if file->error<0 to know
|
|
|
|
if there was an I/O error. Even if there is no "low-level" I/O errors
|
|
|
|
with 'file', any of the high-level above errors is worrying
|
|
|
|
enough to stop the SQL thread now ; as we are skipping the current event,
|
|
|
|
going on with reading and successfully executing other events can
|
|
|
|
only corrupt the slave's databases. So stop.
|
|
|
|
*/
|
|
|
|
file->error= -1;
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
2005-02-09 20:04:28 +01:00
|
|
|
DBUG_RETURN(res);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
2004-11-12 04:01:46 +01:00
|
|
|
Binlog format tolerance is in (buf, event_len, description_event)
|
|
|
|
constructors.
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
Log_event* Log_event::read_log_event(const char* buf, uint event_len,
|
|
|
|
const char **error,
|
|
|
|
const Format_description_log_event *description_event)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
Log_event* ev;
|
|
|
|
DBUG_ENTER("Log_event::read_log_event(char*,...)");
|
2005-02-25 15:53:22 +01:00
|
|
|
DBUG_ASSERT(description_event != 0);
|
2004-11-12 04:01:46 +01:00
|
|
|
DBUG_PRINT("info", ("binlog_version: %d", description_event->binlog_version));
|
2007-12-05 20:00:14 +01:00
|
|
|
DBUG_DUMP("data", (unsigned char*) buf, event_len);
|
|
|
|
|
2007-05-30 12:23:47 +02:00
|
|
|
/* Check the integrity */
|
2001-09-21 02:38:35 +02:00
|
|
|
if (event_len < EVENT_LEN_OFFSET ||
|
2007-05-30 12:23:47 +02:00
|
|
|
buf[EVENT_TYPE_OFFSET] >= ENUM_END_EVENT ||
|
2002-06-11 10:20:31 +02:00
|
|
|
(uint) event_len != uint4korr(buf+EVENT_LEN_OFFSET))
|
|
|
|
{
|
|
|
|
*error="Sanity check failed"; // Needed to free buffer
|
2004-02-16 09:03:25 +01:00
|
|
|
DBUG_RETURN(NULL); // general sanity check - will fail on a partial read
|
2002-06-11 10:20:31 +02:00
|
|
|
}
|
2005-01-16 13:16:23 +01:00
|
|
|
|
BUG#32407: Impossible to do point-in-time recovery from older binlog
Problem: it is unsafe to read base64-printed events without first
reading the Format_description_log_event (FD). Currently, mysqlbinlog
cannot print the FD.
As a side effect, another bug has also been fixed: When mysqlbinlog
--start-position=X was specified, no ROLLBACK was printed. I changed
this, so that ROLLBACK is always printed.
This patch does several things:
- Format_description_log_event (FD) now print themselves in base64
format.
- mysqlbinlog is now able to print FD events. It has three modes:
--base64-output=auto Print row events in base64 output, and print
FD event. The FD event is printed even if
it is outside the range specified with
--start-position, because it would not be
safe to read row events otherwise. This is
the default.
--base64-output=always Like --base64-output=auto, but also print
base64 output for query events. This is
like the old --base64-output flag, which
is also a shorthand for
--base64-output=always
--base64-output=never Never print base64 output, generate error if
row events occur in binlog. This is
useful to suppress the FD event in binlogs
known not to contain row events (e.g.,
because BINLOG statement is unsafe,
requires root privileges, is not SQL, etc)
- the BINLOG statement now handles FD events correctly, by setting
the thread's rli's relay log's description_event_for_exec to the
loaded event.
In fact, executing a BINLOG statement is almost the same as reading
an event from a relay log. Before my patch, the code for this was
separated (exec_relay_log_event in slave.cc executes events from
the relay log, mysql_client_binlog_statement in sql_binlog.cc
executes BINLOG statements). I needed to augment
mysql_client_binlog_statement to do parts of what
exec_relay_log_event does. Hence, I did a small refactoring and
moved parts of exec_relay_log_event to a new function, which I
named apply_event_and_update_pos. apply_event_and_update_pos is
called both from exec_relay_log_event and from
mysql_client_binlog_statement.
- When a non-FD event is executed in a BINLOG statement, without
previously executing a FD event in a BINLOG statement, it generates
an error, because that's unsafe. I took a new error code for that:
ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENTS.
In order to get a decent error message containing the name of the
event, I added the class method char*
Log_event::get_type_str(Log_event_type type), which returns a
string name for the given Log_event_type. This is just like the
existing char* Log_event::get_type_str(), except it is a class
method that takes the log event type as parameter.
I also added PRE_GA_*_ROWS_LOG_EVENT to Log_event::get_type_str(),
so that names of old rows event are properly printed.
- When reading an event, I added a check that the event type is known
by the current Format_description_log_event. Without this, it may
crash on bad input (and I was struck by this several times).
- I patched the following test cases, which all contain BINLOG
statements for row events which must be preceded by BINLOG
statements for FD events:
- rpl_bug31076
While I was here, I fixed some small things in log_event.cc:
- replaced hard-coded 4 by EVENT_TYPE_OFFSET in 3 places
- replaced return by DBUG_VOID_RETURN in one place
- The name of the logfile can be '-' to indicate stdin. Before my
patch, the code just checked if the first character is '-'; now it
does a full strcmp(). Probably, all arguments that begin with a -
are already handled somewhere else as flags, but I still think it
is better that the code reflects what it is supposed to do, with as
little dependencies as possible on other parts of the code. If we
one day implement that all command line arguments after -- are
files (as most unix tools do), then we need this.
I also fixed the following in slave.cc:
- next_event() was declared twice, and queue_event was not static but
should be static (not used outside the file).
2007-12-14 19:02:02 +01:00
|
|
|
uint event_type= buf[EVENT_TYPE_OFFSET];
|
|
|
|
if (event_type > description_event->number_of_event_types &&
|
|
|
|
event_type != FORMAT_DESCRIPTION_EVENT)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
It is unsafe to use the description_event if its post_header_len
|
|
|
|
array does not include the event type.
|
|
|
|
*/
|
|
|
|
DBUG_PRINT("error", ("event type %d found, but the current "
|
|
|
|
"Format_description_log_event supports only %d event "
|
|
|
|
"types", event_type,
|
|
|
|
description_event->number_of_event_types));
|
|
|
|
ev= NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-01-10 16:39:44 +01:00
|
|
|
/*
|
|
|
|
In some previuos versions (see comment in
|
|
|
|
Format_description_log_event::Format_description_log_event(char*,...)),
|
|
|
|
event types were assigned different id numbers than in the
|
|
|
|
present version. In order to replicate from such versions to the
|
|
|
|
present version, we must map those event type id's to our event
|
|
|
|
type id's. The mapping is done with the event_type_permutation
|
|
|
|
array, which was set up when the Format_description_log_event
|
|
|
|
was read.
|
|
|
|
*/
|
|
|
|
if (description_event->event_type_permutation)
|
|
|
|
{
|
|
|
|
IF_DBUG({
|
|
|
|
int new_event_type=
|
|
|
|
description_event->event_type_permutation[event_type];
|
|
|
|
DBUG_PRINT("info",
|
|
|
|
("converting event type %d to %d (%s)",
|
|
|
|
event_type, new_event_type,
|
|
|
|
get_type_str((Log_event_type)new_event_type)));
|
|
|
|
});
|
|
|
|
event_type= description_event->event_type_permutation[event_type];
|
|
|
|
}
|
|
|
|
|
BUG#32407: Impossible to do point-in-time recovery from older binlog
Problem: it is unsafe to read base64-printed events without first
reading the Format_description_log_event (FD). Currently, mysqlbinlog
cannot print the FD.
As a side effect, another bug has also been fixed: When mysqlbinlog
--start-position=X was specified, no ROLLBACK was printed. I changed
this, so that ROLLBACK is always printed.
This patch does several things:
- Format_description_log_event (FD) now print themselves in base64
format.
- mysqlbinlog is now able to print FD events. It has three modes:
--base64-output=auto Print row events in base64 output, and print
FD event. The FD event is printed even if
it is outside the range specified with
--start-position, because it would not be
safe to read row events otherwise. This is
the default.
--base64-output=always Like --base64-output=auto, but also print
base64 output for query events. This is
like the old --base64-output flag, which
is also a shorthand for
--base64-output=always
--base64-output=never Never print base64 output, generate error if
row events occur in binlog. This is
useful to suppress the FD event in binlogs
known not to contain row events (e.g.,
because BINLOG statement is unsafe,
requires root privileges, is not SQL, etc)
- the BINLOG statement now handles FD events correctly, by setting
the thread's rli's relay log's description_event_for_exec to the
loaded event.
In fact, executing a BINLOG statement is almost the same as reading
an event from a relay log. Before my patch, the code for this was
separated (exec_relay_log_event in slave.cc executes events from
the relay log, mysql_client_binlog_statement in sql_binlog.cc
executes BINLOG statements). I needed to augment
mysql_client_binlog_statement to do parts of what
exec_relay_log_event does. Hence, I did a small refactoring and
moved parts of exec_relay_log_event to a new function, which I
named apply_event_and_update_pos. apply_event_and_update_pos is
called both from exec_relay_log_event and from
mysql_client_binlog_statement.
- When a non-FD event is executed in a BINLOG statement, without
previously executing a FD event in a BINLOG statement, it generates
an error, because that's unsafe. I took a new error code for that:
ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENTS.
In order to get a decent error message containing the name of the
event, I added the class method char*
Log_event::get_type_str(Log_event_type type), which returns a
string name for the given Log_event_type. This is just like the
existing char* Log_event::get_type_str(), except it is a class
method that takes the log event type as parameter.
I also added PRE_GA_*_ROWS_LOG_EVENT to Log_event::get_type_str(),
so that names of old rows event are properly printed.
- When reading an event, I added a check that the event type is known
by the current Format_description_log_event. Without this, it may
crash on bad input (and I was struck by this several times).
- I patched the following test cases, which all contain BINLOG
statements for row events which must be preceded by BINLOG
statements for FD events:
- rpl_bug31076
While I was here, I fixed some small things in log_event.cc:
- replaced hard-coded 4 by EVENT_TYPE_OFFSET in 3 places
- replaced return by DBUG_VOID_RETURN in one place
- The name of the logfile can be '-' to indicate stdin. Before my
patch, the code just checked if the first character is '-'; now it
does a full strcmp(). Probably, all arguments that begin with a -
are already handled somewhere else as flags, but I still think it
is better that the code reflects what it is supposed to do, with as
little dependencies as possible on other parts of the code. If we
one day implement that all command line arguments after -- are
files (as most unix tools do), then we need this.
I also fixed the following in slave.cc:
- next_event() was declared twice, and queue_event was not static but
should be static (not used outside the file).
2007-12-14 19:02:02 +01:00
|
|
|
switch(event_type) {
|
|
|
|
case QUERY_EVENT:
|
|
|
|
ev = new Query_log_event(buf, event_len, description_event, QUERY_EVENT);
|
|
|
|
break;
|
|
|
|
case LOAD_EVENT:
|
|
|
|
ev = new Load_log_event(buf, event_len, description_event);
|
|
|
|
break;
|
|
|
|
case NEW_LOAD_EVENT:
|
|
|
|
ev = new Load_log_event(buf, event_len, description_event);
|
|
|
|
break;
|
|
|
|
case ROTATE_EVENT:
|
|
|
|
ev = new Rotate_log_event(buf, event_len, description_event);
|
|
|
|
break;
|
2003-01-15 09:11:44 +01:00
|
|
|
#ifdef HAVE_REPLICATION
|
BUG#32407: Impossible to do point-in-time recovery from older binlog
Problem: it is unsafe to read base64-printed events without first
reading the Format_description_log_event (FD). Currently, mysqlbinlog
cannot print the FD.
As a side effect, another bug has also been fixed: When mysqlbinlog
--start-position=X was specified, no ROLLBACK was printed. I changed
this, so that ROLLBACK is always printed.
This patch does several things:
- Format_description_log_event (FD) now print themselves in base64
format.
- mysqlbinlog is now able to print FD events. It has three modes:
--base64-output=auto Print row events in base64 output, and print
FD event. The FD event is printed even if
it is outside the range specified with
--start-position, because it would not be
safe to read row events otherwise. This is
the default.
--base64-output=always Like --base64-output=auto, but also print
base64 output for query events. This is
like the old --base64-output flag, which
is also a shorthand for
--base64-output=always
--base64-output=never Never print base64 output, generate error if
row events occur in binlog. This is
useful to suppress the FD event in binlogs
known not to contain row events (e.g.,
because BINLOG statement is unsafe,
requires root privileges, is not SQL, etc)
- the BINLOG statement now handles FD events correctly, by setting
the thread's rli's relay log's description_event_for_exec to the
loaded event.
In fact, executing a BINLOG statement is almost the same as reading
an event from a relay log. Before my patch, the code for this was
separated (exec_relay_log_event in slave.cc executes events from
the relay log, mysql_client_binlog_statement in sql_binlog.cc
executes BINLOG statements). I needed to augment
mysql_client_binlog_statement to do parts of what
exec_relay_log_event does. Hence, I did a small refactoring and
moved parts of exec_relay_log_event to a new function, which I
named apply_event_and_update_pos. apply_event_and_update_pos is
called both from exec_relay_log_event and from
mysql_client_binlog_statement.
- When a non-FD event is executed in a BINLOG statement, without
previously executing a FD event in a BINLOG statement, it generates
an error, because that's unsafe. I took a new error code for that:
ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENTS.
In order to get a decent error message containing the name of the
event, I added the class method char*
Log_event::get_type_str(Log_event_type type), which returns a
string name for the given Log_event_type. This is just like the
existing char* Log_event::get_type_str(), except it is a class
method that takes the log event type as parameter.
I also added PRE_GA_*_ROWS_LOG_EVENT to Log_event::get_type_str(),
so that names of old rows event are properly printed.
- When reading an event, I added a check that the event type is known
by the current Format_description_log_event. Without this, it may
crash on bad input (and I was struck by this several times).
- I patched the following test cases, which all contain BINLOG
statements for row events which must be preceded by BINLOG
statements for FD events:
- rpl_bug31076
While I was here, I fixed some small things in log_event.cc:
- replaced hard-coded 4 by EVENT_TYPE_OFFSET in 3 places
- replaced return by DBUG_VOID_RETURN in one place
- The name of the logfile can be '-' to indicate stdin. Before my
patch, the code just checked if the first character is '-'; now it
does a full strcmp(). Probably, all arguments that begin with a -
are already handled somewhere else as flags, but I still think it
is better that the code reflects what it is supposed to do, with as
little dependencies as possible on other parts of the code. If we
one day implement that all command line arguments after -- are
files (as most unix tools do), then we need this.
I also fixed the following in slave.cc:
- next_event() was declared twice, and queue_event was not static but
should be static (not used outside the file).
2007-12-14 19:02:02 +01:00
|
|
|
case SLAVE_EVENT: /* can never happen (unused event) */
|
|
|
|
ev = new Slave_log_event(buf, event_len);
|
|
|
|
break;
|
2003-01-15 09:11:44 +01:00
|
|
|
#endif /* HAVE_REPLICATION */
|
BUG#32407: Impossible to do point-in-time recovery from older binlog
Problem: it is unsafe to read base64-printed events without first
reading the Format_description_log_event (FD). Currently, mysqlbinlog
cannot print the FD.
As a side effect, another bug has also been fixed: When mysqlbinlog
--start-position=X was specified, no ROLLBACK was printed. I changed
this, so that ROLLBACK is always printed.
This patch does several things:
- Format_description_log_event (FD) now print themselves in base64
format.
- mysqlbinlog is now able to print FD events. It has three modes:
--base64-output=auto Print row events in base64 output, and print
FD event. The FD event is printed even if
it is outside the range specified with
--start-position, because it would not be
safe to read row events otherwise. This is
the default.
--base64-output=always Like --base64-output=auto, but also print
base64 output for query events. This is
like the old --base64-output flag, which
is also a shorthand for
--base64-output=always
--base64-output=never Never print base64 output, generate error if
row events occur in binlog. This is
useful to suppress the FD event in binlogs
known not to contain row events (e.g.,
because BINLOG statement is unsafe,
requires root privileges, is not SQL, etc)
- the BINLOG statement now handles FD events correctly, by setting
the thread's rli's relay log's description_event_for_exec to the
loaded event.
In fact, executing a BINLOG statement is almost the same as reading
an event from a relay log. Before my patch, the code for this was
separated (exec_relay_log_event in slave.cc executes events from
the relay log, mysql_client_binlog_statement in sql_binlog.cc
executes BINLOG statements). I needed to augment
mysql_client_binlog_statement to do parts of what
exec_relay_log_event does. Hence, I did a small refactoring and
moved parts of exec_relay_log_event to a new function, which I
named apply_event_and_update_pos. apply_event_and_update_pos is
called both from exec_relay_log_event and from
mysql_client_binlog_statement.
- When a non-FD event is executed in a BINLOG statement, without
previously executing a FD event in a BINLOG statement, it generates
an error, because that's unsafe. I took a new error code for that:
ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENTS.
In order to get a decent error message containing the name of the
event, I added the class method char*
Log_event::get_type_str(Log_event_type type), which returns a
string name for the given Log_event_type. This is just like the
existing char* Log_event::get_type_str(), except it is a class
method that takes the log event type as parameter.
I also added PRE_GA_*_ROWS_LOG_EVENT to Log_event::get_type_str(),
so that names of old rows event are properly printed.
- When reading an event, I added a check that the event type is known
by the current Format_description_log_event. Without this, it may
crash on bad input (and I was struck by this several times).
- I patched the following test cases, which all contain BINLOG
statements for row events which must be preceded by BINLOG
statements for FD events:
- rpl_bug31076
While I was here, I fixed some small things in log_event.cc:
- replaced hard-coded 4 by EVENT_TYPE_OFFSET in 3 places
- replaced return by DBUG_VOID_RETURN in one place
- The name of the logfile can be '-' to indicate stdin. Before my
patch, the code just checked if the first character is '-'; now it
does a full strcmp(). Probably, all arguments that begin with a -
are already handled somewhere else as flags, but I still think it
is better that the code reflects what it is supposed to do, with as
little dependencies as possible on other parts of the code. If we
one day implement that all command line arguments after -- are
files (as most unix tools do), then we need this.
I also fixed the following in slave.cc:
- next_event() was declared twice, and queue_event was not static but
should be static (not used outside the file).
2007-12-14 19:02:02 +01:00
|
|
|
case CREATE_FILE_EVENT:
|
|
|
|
ev = new Create_file_log_event(buf, event_len, description_event);
|
|
|
|
break;
|
|
|
|
case APPEND_BLOCK_EVENT:
|
|
|
|
ev = new Append_block_log_event(buf, event_len, description_event);
|
|
|
|
break;
|
|
|
|
case DELETE_FILE_EVENT:
|
|
|
|
ev = new Delete_file_log_event(buf, event_len, description_event);
|
|
|
|
break;
|
|
|
|
case EXEC_LOAD_EVENT:
|
|
|
|
ev = new Execute_load_log_event(buf, event_len, description_event);
|
|
|
|
break;
|
|
|
|
case START_EVENT_V3: /* this is sent only by MySQL <=4.x */
|
|
|
|
ev = new Start_log_event_v3(buf, description_event);
|
|
|
|
break;
|
|
|
|
case STOP_EVENT:
|
|
|
|
ev = new Stop_log_event(buf, description_event);
|
|
|
|
break;
|
|
|
|
case INTVAR_EVENT:
|
|
|
|
ev = new Intvar_log_event(buf, description_event);
|
|
|
|
break;
|
|
|
|
case XID_EVENT:
|
|
|
|
ev = new Xid_log_event(buf, description_event);
|
|
|
|
break;
|
|
|
|
case RAND_EVENT:
|
|
|
|
ev = new Rand_log_event(buf, description_event);
|
|
|
|
break;
|
|
|
|
case USER_VAR_EVENT:
|
|
|
|
ev = new User_var_log_event(buf, description_event);
|
|
|
|
break;
|
|
|
|
case FORMAT_DESCRIPTION_EVENT:
|
|
|
|
ev = new Format_description_log_event(buf, event_len, description_event);
|
|
|
|
break;
|
2006-12-07 15:18:35 +01:00
|
|
|
#if defined(HAVE_REPLICATION)
|
BUG#32407: Impossible to do point-in-time recovery from older binlog
Problem: it is unsafe to read base64-printed events without first
reading the Format_description_log_event (FD). Currently, mysqlbinlog
cannot print the FD.
As a side effect, another bug has also been fixed: When mysqlbinlog
--start-position=X was specified, no ROLLBACK was printed. I changed
this, so that ROLLBACK is always printed.
This patch does several things:
- Format_description_log_event (FD) now print themselves in base64
format.
- mysqlbinlog is now able to print FD events. It has three modes:
--base64-output=auto Print row events in base64 output, and print
FD event. The FD event is printed even if
it is outside the range specified with
--start-position, because it would not be
safe to read row events otherwise. This is
the default.
--base64-output=always Like --base64-output=auto, but also print
base64 output for query events. This is
like the old --base64-output flag, which
is also a shorthand for
--base64-output=always
--base64-output=never Never print base64 output, generate error if
row events occur in binlog. This is
useful to suppress the FD event in binlogs
known not to contain row events (e.g.,
because BINLOG statement is unsafe,
requires root privileges, is not SQL, etc)
- the BINLOG statement now handles FD events correctly, by setting
the thread's rli's relay log's description_event_for_exec to the
loaded event.
In fact, executing a BINLOG statement is almost the same as reading
an event from a relay log. Before my patch, the code for this was
separated (exec_relay_log_event in slave.cc executes events from
the relay log, mysql_client_binlog_statement in sql_binlog.cc
executes BINLOG statements). I needed to augment
mysql_client_binlog_statement to do parts of what
exec_relay_log_event does. Hence, I did a small refactoring and
moved parts of exec_relay_log_event to a new function, which I
named apply_event_and_update_pos. apply_event_and_update_pos is
called both from exec_relay_log_event and from
mysql_client_binlog_statement.
- When a non-FD event is executed in a BINLOG statement, without
previously executing a FD event in a BINLOG statement, it generates
an error, because that's unsafe. I took a new error code for that:
ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENTS.
In order to get a decent error message containing the name of the
event, I added the class method char*
Log_event::get_type_str(Log_event_type type), which returns a
string name for the given Log_event_type. This is just like the
existing char* Log_event::get_type_str(), except it is a class
method that takes the log event type as parameter.
I also added PRE_GA_*_ROWS_LOG_EVENT to Log_event::get_type_str(),
so that names of old rows event are properly printed.
- When reading an event, I added a check that the event type is known
by the current Format_description_log_event. Without this, it may
crash on bad input (and I was struck by this several times).
- I patched the following test cases, which all contain BINLOG
statements for row events which must be preceded by BINLOG
statements for FD events:
- rpl_bug31076
While I was here, I fixed some small things in log_event.cc:
- replaced hard-coded 4 by EVENT_TYPE_OFFSET in 3 places
- replaced return by DBUG_VOID_RETURN in one place
- The name of the logfile can be '-' to indicate stdin. Before my
patch, the code just checked if the first character is '-'; now it
does a full strcmp(). Probably, all arguments that begin with a -
are already handled somewhere else as flags, but I still think it
is better that the code reflects what it is supposed to do, with as
little dependencies as possible on other parts of the code. If we
one day implement that all command line arguments after -- are
files (as most unix tools do), then we need this.
I also fixed the following in slave.cc:
- next_event() was declared twice, and queue_event was not static but
should be static (not used outside the file).
2007-12-14 19:02:02 +01:00
|
|
|
case PRE_GA_WRITE_ROWS_EVENT:
|
|
|
|
ev = new Write_rows_log_event_old(buf, event_len, description_event);
|
|
|
|
break;
|
|
|
|
case PRE_GA_UPDATE_ROWS_EVENT:
|
|
|
|
ev = new Update_rows_log_event_old(buf, event_len, description_event);
|
|
|
|
break;
|
|
|
|
case PRE_GA_DELETE_ROWS_EVENT:
|
|
|
|
ev = new Delete_rows_log_event_old(buf, event_len, description_event);
|
|
|
|
break;
|
|
|
|
case WRITE_ROWS_EVENT:
|
|
|
|
ev = new Write_rows_log_event(buf, event_len, description_event);
|
|
|
|
break;
|
|
|
|
case UPDATE_ROWS_EVENT:
|
|
|
|
ev = new Update_rows_log_event(buf, event_len, description_event);
|
|
|
|
break;
|
|
|
|
case DELETE_ROWS_EVENT:
|
|
|
|
ev = new Delete_rows_log_event(buf, event_len, description_event);
|
|
|
|
break;
|
|
|
|
case TABLE_MAP_EVENT:
|
|
|
|
ev = new Table_map_log_event(buf, event_len, description_event);
|
|
|
|
break;
|
2005-12-22 06:39:02 +01:00
|
|
|
#endif
|
BUG#32407: Impossible to do point-in-time recovery from older binlog
Problem: it is unsafe to read base64-printed events without first
reading the Format_description_log_event (FD). Currently, mysqlbinlog
cannot print the FD.
As a side effect, another bug has also been fixed: When mysqlbinlog
--start-position=X was specified, no ROLLBACK was printed. I changed
this, so that ROLLBACK is always printed.
This patch does several things:
- Format_description_log_event (FD) now print themselves in base64
format.
- mysqlbinlog is now able to print FD events. It has three modes:
--base64-output=auto Print row events in base64 output, and print
FD event. The FD event is printed even if
it is outside the range specified with
--start-position, because it would not be
safe to read row events otherwise. This is
the default.
--base64-output=always Like --base64-output=auto, but also print
base64 output for query events. This is
like the old --base64-output flag, which
is also a shorthand for
--base64-output=always
--base64-output=never Never print base64 output, generate error if
row events occur in binlog. This is
useful to suppress the FD event in binlogs
known not to contain row events (e.g.,
because BINLOG statement is unsafe,
requires root privileges, is not SQL, etc)
- the BINLOG statement now handles FD events correctly, by setting
the thread's rli's relay log's description_event_for_exec to the
loaded event.
In fact, executing a BINLOG statement is almost the same as reading
an event from a relay log. Before my patch, the code for this was
separated (exec_relay_log_event in slave.cc executes events from
the relay log, mysql_client_binlog_statement in sql_binlog.cc
executes BINLOG statements). I needed to augment
mysql_client_binlog_statement to do parts of what
exec_relay_log_event does. Hence, I did a small refactoring and
moved parts of exec_relay_log_event to a new function, which I
named apply_event_and_update_pos. apply_event_and_update_pos is
called both from exec_relay_log_event and from
mysql_client_binlog_statement.
- When a non-FD event is executed in a BINLOG statement, without
previously executing a FD event in a BINLOG statement, it generates
an error, because that's unsafe. I took a new error code for that:
ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENTS.
In order to get a decent error message containing the name of the
event, I added the class method char*
Log_event::get_type_str(Log_event_type type), which returns a
string name for the given Log_event_type. This is just like the
existing char* Log_event::get_type_str(), except it is a class
method that takes the log event type as parameter.
I also added PRE_GA_*_ROWS_LOG_EVENT to Log_event::get_type_str(),
so that names of old rows event are properly printed.
- When reading an event, I added a check that the event type is known
by the current Format_description_log_event. Without this, it may
crash on bad input (and I was struck by this several times).
- I patched the following test cases, which all contain BINLOG
statements for row events which must be preceded by BINLOG
statements for FD events:
- rpl_bug31076
While I was here, I fixed some small things in log_event.cc:
- replaced hard-coded 4 by EVENT_TYPE_OFFSET in 3 places
- replaced return by DBUG_VOID_RETURN in one place
- The name of the logfile can be '-' to indicate stdin. Before my
patch, the code just checked if the first character is '-'; now it
does a full strcmp(). Probably, all arguments that begin with a -
are already handled somewhere else as flags, but I still think it
is better that the code reflects what it is supposed to do, with as
little dependencies as possible on other parts of the code. If we
one day implement that all command line arguments after -- are
files (as most unix tools do), then we need this.
I also fixed the following in slave.cc:
- next_event() was declared twice, and queue_event was not static but
should be static (not used outside the file).
2007-12-14 19:02:02 +01:00
|
|
|
case BEGIN_LOAD_QUERY_EVENT:
|
|
|
|
ev = new Begin_load_query_log_event(buf, event_len, description_event);
|
|
|
|
break;
|
|
|
|
case EXECUTE_LOAD_QUERY_EVENT:
|
|
|
|
ev= new Execute_load_query_log_event(buf, event_len, description_event);
|
|
|
|
break;
|
|
|
|
case INCIDENT_EVENT:
|
|
|
|
ev = new Incident_log_event(buf, event_len, description_event);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
DBUG_PRINT("error",("Unknown event code: %d",
|
|
|
|
(int) buf[EVENT_TYPE_OFFSET]));
|
|
|
|
ev= NULL;
|
|
|
|
break;
|
|
|
|
}
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2005-02-09 20:04:28 +01:00
|
|
|
|
2007-04-12 08:58:04 +02:00
|
|
|
DBUG_PRINT("read_event", ("%s(type_code: %d; event_len: %d)",
|
|
|
|
ev ? ev->get_type_str() : "<unknown>",
|
|
|
|
buf[EVENT_TYPE_OFFSET],
|
|
|
|
event_len));
|
2004-11-12 04:01:46 +01:00
|
|
|
/*
|
2005-02-09 20:04:28 +01:00
|
|
|
is_valid() are small event-specific sanity tests which are
|
|
|
|
important; for example there are some my_malloc() in constructors
|
|
|
|
(e.g. Query_log_event::Query_log_event(char*...)); when these
|
|
|
|
my_malloc() fail we can't return an error out of the constructor
|
|
|
|
(because constructor is "void") ; so instead we leave the pointer we
|
|
|
|
wanted to allocate (e.g. 'query') to 0 and we test it in is_valid().
|
|
|
|
Same for Format_description_log_event, member 'post_header_len'.
|
2004-11-12 04:01:46 +01:00
|
|
|
*/
|
2002-06-11 10:20:31 +02:00
|
|
|
if (!ev || !ev->is_valid())
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
DBUG_PRINT("error",("Found invalid event in binary log"));
|
|
|
|
|
2001-08-03 23:57:53 +02:00
|
|
|
delete ev;
|
2003-04-23 15:00:07 +02:00
|
|
|
#ifdef MYSQL_CLIENT
|
2004-11-12 04:01:46 +01:00
|
|
|
if (!force_opt) /* then mysqlbinlog dies */
|
2003-04-23 15:00:07 +02:00
|
|
|
{
|
|
|
|
*error= "Found invalid event in binary log";
|
2004-02-16 09:03:25 +01:00
|
|
|
DBUG_RETURN(0);
|
2003-04-23 15:00:07 +02:00
|
|
|
}
|
2004-11-12 04:01:46 +01:00
|
|
|
ev= new Unknown_log_event(buf, description_event);
|
2003-04-23 15:00:07 +02:00
|
|
|
#else
|
|
|
|
*error= "Found invalid event in binary log";
|
2004-02-16 09:03:25 +01:00
|
|
|
DBUG_RETURN(0);
|
2003-04-23 15:00:07 +02:00
|
|
|
#endif
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
2004-02-16 09:03:25 +01:00
|
|
|
DBUG_RETURN(ev);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
2001-07-21 00:22:54 +02:00
|
|
|
#ifdef MYSQL_CLIENT
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Log_event::print_header()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2006-10-06 10:17:02 +02:00
|
|
|
void Log_event::print_header(IO_CACHE* file,
|
|
|
|
PRINT_EVENT_INFO* print_event_info,
|
|
|
|
bool is_more __attribute__((unused)))
|
2000-09-29 00:24:50 +02:00
|
|
|
{
|
2002-01-20 03:16:52 +01:00
|
|
|
char llbuff[22];
|
2005-10-19 19:31:24 +02:00
|
|
|
my_off_t hexdump_from= print_event_info->hexdump_from;
|
2006-10-06 10:17:02 +02:00
|
|
|
DBUG_ENTER("Log_event::print_header");
|
2005-10-12 23:37:21 +02:00
|
|
|
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(file, "#");
|
2000-09-29 00:24:50 +02:00
|
|
|
print_timestamp(file);
|
2009-02-24 15:59:46 +01:00
|
|
|
my_b_printf(file, " server id %lu end_log_pos %s ", (ulong) server_id,
|
2006-10-06 10:17:02 +02:00
|
|
|
llstr(log_pos,llbuff));
|
2005-09-29 10:42:23 +02:00
|
|
|
|
2005-09-30 00:12:14 +02:00
|
|
|
/* mysqlbinlog --hexdump */
|
2005-10-19 19:31:24 +02:00
|
|
|
if (print_event_info->hexdump_from)
|
2005-09-29 10:42:23 +02:00
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(file, "\n");
|
2005-09-30 00:12:14 +02:00
|
|
|
uchar *ptr= (uchar*)temp_buf;
|
|
|
|
my_off_t size=
|
|
|
|
uint4korr(ptr + EVENT_LEN_OFFSET) - LOG_EVENT_MINIMAL_HEADER_LEN;
|
2005-09-29 10:42:23 +02:00
|
|
|
my_off_t i;
|
|
|
|
|
2005-09-30 00:12:14 +02:00
|
|
|
/* Header len * 4 >= header len * (2 chars + space + extra space) */
|
|
|
|
char *h, hex_string[LOG_EVENT_MINIMAL_HEADER_LEN*4]= {0};
|
|
|
|
char *c, char_string[16+1]= {0};
|
|
|
|
|
2005-10-12 23:37:21 +02:00
|
|
|
/* Pretty-print event common header if header is exactly 19 bytes */
|
2005-10-19 19:31:24 +02:00
|
|
|
if (print_event_info->common_header_len == LOG_EVENT_MINIMAL_HEADER_LEN)
|
2005-10-12 23:37:21 +02:00
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
char emit_buf[256]; // Enough for storing one line
|
|
|
|
my_b_printf(file, "# Position Timestamp Type Master ID "
|
|
|
|
"Size Master Pos Flags \n");
|
2009-02-13 17:41:47 +01:00
|
|
|
size_t const bytes_written=
|
2006-10-06 10:17:02 +02:00
|
|
|
my_snprintf(emit_buf, sizeof(emit_buf),
|
|
|
|
"# %8.8lx %02x %02x %02x %02x %02x "
|
|
|
|
"%02x %02x %02x %02x %02x %02x %02x %02x "
|
|
|
|
"%02x %02x %02x %02x %02x %02x\n",
|
|
|
|
(unsigned long) hexdump_from,
|
|
|
|
ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6],
|
|
|
|
ptr[7], ptr[8], ptr[9], ptr[10], ptr[11], ptr[12], ptr[13],
|
|
|
|
ptr[14], ptr[15], ptr[16], ptr[17], ptr[18]);
|
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
|
|
|
DBUG_ASSERT(static_cast<size_t>(bytes_written) < sizeof(emit_buf));
|
|
|
|
my_b_write(file, (uchar*) emit_buf, bytes_written);
|
2005-10-12 23:37:21 +02:00
|
|
|
ptr += LOG_EVENT_MINIMAL_HEADER_LEN;
|
|
|
|
hexdump_from += LOG_EVENT_MINIMAL_HEADER_LEN;
|
|
|
|
}
|
2005-09-30 00:12:14 +02:00
|
|
|
|
|
|
|
/* Rest of event (without common header) */
|
|
|
|
for (i= 0, c= char_string, h=hex_string;
|
|
|
|
i < size;
|
|
|
|
i++, ptr++)
|
2005-09-29 10:42:23 +02:00
|
|
|
{
|
2005-09-30 00:12:14 +02:00
|
|
|
my_snprintf(h, 4, "%02x ", *ptr);
|
|
|
|
h += 3;
|
2005-09-29 10:42:23 +02:00
|
|
|
|
2005-09-30 00:12:14 +02:00
|
|
|
*c++= my_isalnum(&my_charset_bin, *ptr) ? *ptr : '.';
|
2005-09-29 10:42:23 +02:00
|
|
|
|
|
|
|
if (i % 16 == 15)
|
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
/*
|
|
|
|
my_b_printf() does not support full printf() formats, so we
|
|
|
|
have to do it this way.
|
|
|
|
|
|
|
|
TODO: Rewrite my_b_printf() to support full printf() syntax.
|
|
|
|
*/
|
|
|
|
char emit_buf[256];
|
2009-02-13 17:41:47 +01:00
|
|
|
size_t const bytes_written=
|
2006-10-06 10:17:02 +02:00
|
|
|
my_snprintf(emit_buf, sizeof(emit_buf),
|
|
|
|
"# %8.8lx %-48.48s |%16s|\n",
|
|
|
|
(unsigned long) (hexdump_from + (i & 0xfffffff0)),
|
|
|
|
hex_string, char_string);
|
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
|
|
|
DBUG_ASSERT(static_cast<size_t>(bytes_written) < sizeof(emit_buf));
|
|
|
|
my_b_write(file, (uchar*) emit_buf, bytes_written);
|
2005-09-30 00:12:14 +02:00
|
|
|
hex_string[0]= 0;
|
|
|
|
char_string[0]= 0;
|
|
|
|
c= char_string;
|
|
|
|
h= hex_string;
|
2005-09-29 10:42:23 +02:00
|
|
|
}
|
2005-09-30 00:12:14 +02:00
|
|
|
else if (i % 8 == 7) *h++ = ' ';
|
2005-09-29 10:42:23 +02:00
|
|
|
}
|
2005-09-30 00:12:14 +02:00
|
|
|
*c= '\0';
|
2005-09-29 10:42:23 +02:00
|
|
|
|
2006-01-05 23:47:49 +01:00
|
|
|
if (hex_string[0])
|
2006-10-06 10:17:02 +02:00
|
|
|
{
|
|
|
|
char emit_buf[256];
|
2009-02-13 17:41:47 +01:00
|
|
|
size_t const bytes_written=
|
2006-10-06 10:17:02 +02:00
|
|
|
my_snprintf(emit_buf, sizeof(emit_buf),
|
2007-02-23 22:23:54 +01:00
|
|
|
"# %8.8lx %-48.48s |%s|\n",
|
2006-10-06 10:17:02 +02:00
|
|
|
(unsigned long) (hexdump_from + (i & 0xfffffff0)),
|
|
|
|
hex_string, char_string);
|
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
|
|
|
DBUG_ASSERT(static_cast<size_t>(bytes_written) < sizeof(emit_buf));
|
|
|
|
my_b_write(file, (uchar*) emit_buf, bytes_written);
|
2006-10-06 10:17:02 +02:00
|
|
|
}
|
2007-02-23 22:23:54 +01:00
|
|
|
/*
|
|
|
|
need a # to prefix the rest of printouts for example those of
|
|
|
|
Rows_log_event::print_helper().
|
|
|
|
*/
|
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_b_write(file, reinterpret_cast<const uchar*>("# "), 2);
|
2005-09-29 10:42:23 +02:00
|
|
|
}
|
2006-10-06 10:17:02 +02:00
|
|
|
DBUG_VOID_RETURN;
|
2000-09-29 00:24:50 +02:00
|
|
|
}
|
|
|
|
|
2005-09-29 10:42:23 +02:00
|
|
|
|
2008-08-20 16:06:31 +02:00
|
|
|
/**
|
|
|
|
Prints a quoted string to io cache.
|
|
|
|
Control characters are displayed as hex sequence, e.g. \x00
|
|
|
|
|
|
|
|
@param[in] file IO cache
|
|
|
|
@param[in] prt Pointer to string
|
|
|
|
@param[in] length String length
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void
|
|
|
|
my_b_write_quoted(IO_CACHE *file, const uchar *ptr, uint length)
|
|
|
|
{
|
|
|
|
const uchar *s;
|
|
|
|
my_b_printf(file, "'");
|
|
|
|
for (s= ptr; length > 0 ; s++, length--)
|
|
|
|
{
|
|
|
|
if (*s > 0x1F)
|
|
|
|
my_b_write(file, s, 1);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
uchar hex[10];
|
|
|
|
size_t len= my_snprintf((char*) hex, sizeof(hex), "%s%02x", "\\x", *s);
|
|
|
|
my_b_write(file, hex, len);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
my_b_printf(file, "'");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
Prints a bit string to io cache in format b'1010'.
|
|
|
|
|
|
|
|
@param[in] file IO cache
|
|
|
|
@param[in] ptr Pointer to string
|
|
|
|
@param[in] nbits Number of bits
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
my_b_write_bit(IO_CACHE *file, const uchar *ptr, uint nbits)
|
|
|
|
{
|
|
|
|
uint bitnum, nbits8= ((nbits + 7) / 8) * 8, skip_bits= nbits8 - nbits;
|
|
|
|
my_b_printf(file, "b'");
|
|
|
|
for (bitnum= skip_bits ; bitnum < nbits8; bitnum++)
|
|
|
|
{
|
|
|
|
int is_set= (ptr[(bitnum) / 8] >> (7 - bitnum % 8)) & 0x01;
|
|
|
|
my_b_write(file, (const uchar*) (is_set ? "1" : "0"), 1);
|
|
|
|
}
|
|
|
|
my_b_printf(file, "'");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
Prints a packed string to io cache.
|
|
|
|
The string consists of length packed to 1 or 2 bytes,
|
|
|
|
followed by string data itself.
|
|
|
|
|
|
|
|
@param[in] file IO cache
|
|
|
|
@param[in] ptr Pointer to string
|
|
|
|
@param[in] length String size
|
|
|
|
|
|
|
|
@retval - number of bytes scanned.
|
|
|
|
*/
|
|
|
|
static size_t
|
|
|
|
my_b_write_quoted_with_length(IO_CACHE *file, const uchar *ptr, uint length)
|
|
|
|
{
|
|
|
|
if (length < 256)
|
|
|
|
{
|
|
|
|
length= *ptr;
|
|
|
|
my_b_write_quoted(file, ptr + 1, length);
|
|
|
|
return length + 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
length= uint2korr(ptr);
|
|
|
|
my_b_write_quoted(file, ptr + 2, length);
|
|
|
|
return length + 2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
Prints a 32-bit number in both signed and unsigned representation
|
|
|
|
|
|
|
|
@param[in] file IO cache
|
|
|
|
@param[in] sl Signed number
|
|
|
|
@param[in] ul Unsigned number
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
my_b_write_sint32_and_uint32(IO_CACHE *file, int32 si, uint32 ui)
|
|
|
|
{
|
|
|
|
my_b_printf(file, "%d", si);
|
|
|
|
if (si < 0)
|
|
|
|
my_b_printf(file, " (%u)", ui);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
Print a packed value of the given SQL type into IO cache
|
|
|
|
|
|
|
|
@param[in] file IO cache
|
|
|
|
@param[in] ptr Pointer to string
|
|
|
|
@param[in] type Column type
|
|
|
|
@param[in] meta Column meta information
|
|
|
|
@param[out] typestr SQL type string buffer (for verbose output)
|
|
|
|
@param[out] typestr_length Size of typestr
|
|
|
|
|
|
|
|
@retval - number of bytes scanned from ptr.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static size_t
|
|
|
|
log_event_print_value(IO_CACHE *file, const uchar *ptr,
|
|
|
|
uint type, uint meta,
|
|
|
|
char *typestr, size_t typestr_length)
|
|
|
|
{
|
|
|
|
uint32 length= 0;
|
|
|
|
|
|
|
|
if (type == MYSQL_TYPE_STRING)
|
|
|
|
{
|
|
|
|
if (meta >= 256)
|
|
|
|
{
|
|
|
|
uint byte0= meta >> 8;
|
|
|
|
uint byte1= meta & 0xFF;
|
|
|
|
|
|
|
|
if ((byte0 & 0x30) != 0x30)
|
|
|
|
{
|
|
|
|
/* a long CHAR() field: see #37426 */
|
|
|
|
length= byte1 | (((byte0 & 0x30) ^ 0x30) << 4);
|
|
|
|
type= byte0 | 0x30;
|
|
|
|
goto beg;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (byte0)
|
|
|
|
{
|
|
|
|
case MYSQL_TYPE_SET:
|
|
|
|
case MYSQL_TYPE_ENUM:
|
|
|
|
case MYSQL_TYPE_STRING:
|
|
|
|
type= byte0;
|
|
|
|
length= byte1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
|
|
|
{
|
|
|
|
char tmp[5];
|
|
|
|
my_snprintf(tmp, sizeof(tmp), "%04X", meta);
|
|
|
|
my_b_printf(file,
|
|
|
|
"!! Don't know how to handle column type=%d meta=%d (%s)",
|
|
|
|
type, meta, tmp);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
length= meta;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
beg:
|
|
|
|
|
|
|
|
switch (type) {
|
|
|
|
case MYSQL_TYPE_LONG:
|
|
|
|
{
|
|
|
|
int32 si= sint4korr(ptr);
|
|
|
|
uint32 ui= uint4korr(ptr);
|
|
|
|
my_b_write_sint32_and_uint32(file, si, ui);
|
|
|
|
my_snprintf(typestr, typestr_length, "INT");
|
|
|
|
return 4;
|
|
|
|
}
|
|
|
|
|
|
|
|
case MYSQL_TYPE_TINY:
|
|
|
|
{
|
|
|
|
my_b_write_sint32_and_uint32(file, (int) (signed char) *ptr,
|
|
|
|
(uint) (unsigned char) *ptr);
|
|
|
|
my_snprintf(typestr, typestr_length, "TINYINT");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
case MYSQL_TYPE_SHORT:
|
|
|
|
{
|
|
|
|
int32 si= (int32) sint2korr(ptr);
|
|
|
|
uint32 ui= (uint32) uint2korr(ptr);
|
|
|
|
my_b_write_sint32_and_uint32(file, si, ui);
|
|
|
|
my_snprintf(typestr, typestr_length, "SHORTINT");
|
|
|
|
return 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
case MYSQL_TYPE_INT24:
|
|
|
|
{
|
|
|
|
int32 si= sint3korr(ptr);
|
|
|
|
uint32 ui= uint3korr(ptr);
|
|
|
|
my_b_write_sint32_and_uint32(file, si, ui);
|
|
|
|
my_snprintf(typestr, typestr_length, "MEDIUMINT");
|
|
|
|
return 3;
|
|
|
|
}
|
|
|
|
|
|
|
|
case MYSQL_TYPE_LONGLONG:
|
|
|
|
{
|
|
|
|
char tmp[64];
|
|
|
|
longlong si= sint8korr(ptr);
|
|
|
|
longlong10_to_str(si, tmp, -10);
|
|
|
|
my_b_printf(file, "%s", tmp);
|
|
|
|
if (si < 0)
|
|
|
|
{
|
|
|
|
ulonglong ui= uint8korr(ptr);
|
|
|
|
longlong10_to_str((longlong) ui, tmp, 10);
|
|
|
|
my_b_printf(file, " (%s)", tmp);
|
|
|
|
}
|
|
|
|
my_snprintf(typestr, typestr_length, "LONGINT");
|
|
|
|
return 8;
|
|
|
|
}
|
|
|
|
|
|
|
|
case MYSQL_TYPE_NEWDECIMAL:
|
|
|
|
{
|
|
|
|
uint precision= meta >> 8;
|
|
|
|
uint decimals= meta & 0xFF;
|
|
|
|
uint bin_size= my_decimal_get_binary_size(precision, decimals);
|
|
|
|
my_decimal dec;
|
|
|
|
binary2my_decimal(E_DEC_FATAL_ERROR, (uchar*) ptr, &dec,
|
|
|
|
precision, decimals);
|
|
|
|
int i, end;
|
|
|
|
char buff[512], *pos;
|
|
|
|
pos= buff;
|
|
|
|
pos+= my_sprintf(buff, (buff, "%s", dec.sign() ? "-" : ""));
|
|
|
|
end= ROUND_UP(dec.frac) + ROUND_UP(dec.intg)-1;
|
|
|
|
for (i=0; i < end; i++)
|
|
|
|
pos+= my_sprintf(pos, (pos, "%09d.", dec.buf[i]));
|
|
|
|
pos+= my_sprintf(pos, (pos, "%09d", dec.buf[i]));
|
|
|
|
my_b_printf(file, "%s", buff);
|
|
|
|
my_snprintf(typestr, typestr_length, "DECIMAL(%d,%d)",
|
|
|
|
precision, decimals);
|
|
|
|
return bin_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
case MYSQL_TYPE_FLOAT:
|
|
|
|
{
|
|
|
|
float fl;
|
|
|
|
float4get(fl, ptr);
|
|
|
|
char tmp[320];
|
|
|
|
sprintf(tmp, "%-20g", (double) fl);
|
|
|
|
my_b_printf(file, "%s", tmp); /* my_snprintf doesn't support %-20g */
|
|
|
|
my_snprintf(typestr, typestr_length, "FLOAT");
|
|
|
|
return 4;
|
|
|
|
}
|
|
|
|
|
|
|
|
case MYSQL_TYPE_DOUBLE:
|
|
|
|
{
|
|
|
|
double dbl;
|
2008-08-25 09:58:29 +02:00
|
|
|
float8get(dbl, ptr);
|
2008-08-20 16:06:31 +02:00
|
|
|
char tmp[320];
|
|
|
|
sprintf(tmp, "%-.20g", dbl); /* my_snprintf doesn't support %-20g */
|
|
|
|
my_b_printf(file, "%s", tmp);
|
|
|
|
strcpy(typestr, "DOUBLE");
|
|
|
|
return 8;
|
|
|
|
}
|
|
|
|
|
|
|
|
case MYSQL_TYPE_BIT:
|
|
|
|
{
|
|
|
|
/* Meta-data: bit_len, bytes_in_rec, 2 bytes */
|
|
|
|
uint nbits= ((meta >> 8) * 8) + (meta & 0xFF);
|
|
|
|
length= (nbits + 7) / 8;
|
|
|
|
my_b_write_bit(file, ptr, nbits);
|
|
|
|
my_snprintf(typestr, typestr_length, "BIT(%d)", nbits);
|
|
|
|
return length;
|
|
|
|
}
|
|
|
|
|
|
|
|
case MYSQL_TYPE_TIMESTAMP:
|
|
|
|
{
|
|
|
|
uint32 i32= uint4korr(ptr);
|
|
|
|
my_b_printf(file, "%d", i32);
|
|
|
|
my_snprintf(typestr, typestr_length, "TIMESTAMP");
|
|
|
|
return 4;
|
|
|
|
}
|
|
|
|
|
|
|
|
case MYSQL_TYPE_DATETIME:
|
|
|
|
{
|
2009-02-13 17:41:47 +01:00
|
|
|
size_t d, t;
|
2008-08-20 16:06:31 +02:00
|
|
|
uint64 i64= uint8korr(ptr); /* YYYYMMDDhhmmss */
|
|
|
|
d= i64 / 1000000;
|
|
|
|
t= i64 % 1000000;
|
|
|
|
my_b_printf(file, "%04d-%02d-%02d %02d:%02d:%02d",
|
|
|
|
d / 10000, (d % 10000) / 100, d % 100,
|
|
|
|
t / 10000, (t % 10000) / 100, t % 100);
|
|
|
|
my_snprintf(typestr, typestr_length, "DATETIME");
|
|
|
|
return 8;
|
|
|
|
}
|
|
|
|
|
|
|
|
case MYSQL_TYPE_TIME:
|
|
|
|
{
|
|
|
|
uint32 i32= uint3korr(ptr);
|
|
|
|
my_b_printf(file, "'%02d:%02d:%02d'",
|
|
|
|
i32 / 10000, (i32 % 10000) / 100, i32 % 100);
|
|
|
|
my_snprintf(typestr, typestr_length, "TIME");
|
|
|
|
return 3;
|
|
|
|
}
|
|
|
|
|
|
|
|
case MYSQL_TYPE_DATE:
|
|
|
|
{
|
|
|
|
uint i32= uint3korr(ptr);
|
|
|
|
my_b_printf(file , "'%04d:%02d:%02d'",
|
|
|
|
(i32 / (16L * 32L)), (i32 / 32L % 16L), (i32 % 32L));
|
|
|
|
my_snprintf(typestr, typestr_length, "DATE");
|
|
|
|
return 3;
|
|
|
|
}
|
|
|
|
|
|
|
|
case MYSQL_TYPE_YEAR:
|
|
|
|
{
|
|
|
|
uint32 i32= *ptr;
|
|
|
|
my_b_printf(file, "%04d", i32+ 1900);
|
|
|
|
my_snprintf(typestr, typestr_length, "YEAR");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
case MYSQL_TYPE_ENUM:
|
|
|
|
switch (length) {
|
|
|
|
case 1:
|
|
|
|
my_b_printf(file, "%d", (int) *ptr);
|
|
|
|
my_snprintf(typestr, typestr_length, "ENUM(1 byte)");
|
|
|
|
return 1;
|
|
|
|
case 2:
|
|
|
|
{
|
|
|
|
int32 i32= uint2korr(ptr);
|
|
|
|
my_b_printf(file, "%d", i32);
|
|
|
|
my_snprintf(typestr, typestr_length, "ENUM(2 bytes)");
|
|
|
|
return 2;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
my_b_printf(file, "!! Unknown ENUM packlen=%d", length);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MYSQL_TYPE_SET:
|
|
|
|
my_b_write_bit(file, ptr , length * 8);
|
|
|
|
my_snprintf(typestr, typestr_length, "SET(%d bytes)", length);
|
|
|
|
return length;
|
|
|
|
|
|
|
|
case MYSQL_TYPE_BLOB:
|
|
|
|
switch (meta) {
|
|
|
|
case 1:
|
|
|
|
length= *ptr;
|
|
|
|
my_b_write_quoted(file, ptr + 1, length);
|
|
|
|
my_snprintf(typestr, typestr_length, "TINYBLOB/TINYTEXT");
|
|
|
|
return length + 1;
|
|
|
|
case 2:
|
|
|
|
length= uint2korr(ptr);
|
|
|
|
my_b_write_quoted(file, ptr + 2, length);
|
|
|
|
my_snprintf(typestr, typestr_length, "BLOB/TEXT");
|
|
|
|
return length + 2;
|
|
|
|
case 3:
|
|
|
|
length= uint3korr(ptr);
|
|
|
|
my_b_write_quoted(file, ptr + 3, length);
|
|
|
|
my_snprintf(typestr, typestr_length, "MEDIUMBLOB/MEDIUMTEXT");
|
|
|
|
return length + 3;
|
|
|
|
case 4:
|
|
|
|
length= uint4korr(ptr);
|
|
|
|
my_b_write_quoted(file, ptr + 4, length);
|
|
|
|
my_snprintf(typestr, typestr_length, "LONGBLOB/LONGTEXT");
|
|
|
|
return length + 4;
|
|
|
|
default:
|
|
|
|
my_b_printf(file, "!! Unknown BLOB packlen=%d", length);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
case MYSQL_TYPE_VARCHAR:
|
|
|
|
case MYSQL_TYPE_VAR_STRING:
|
|
|
|
length= meta;
|
|
|
|
my_snprintf(typestr, typestr_length, "VARSTRING(%d)", length);
|
|
|
|
return my_b_write_quoted_with_length(file, ptr, length);
|
|
|
|
|
|
|
|
case MYSQL_TYPE_STRING:
|
|
|
|
my_snprintf(typestr, typestr_length, "STRING(%d)", length);
|
|
|
|
return my_b_write_quoted_with_length(file, ptr, length);
|
|
|
|
|
|
|
|
default:
|
|
|
|
{
|
|
|
|
char tmp[5];
|
|
|
|
my_snprintf(tmp, sizeof(tmp), "%04x", meta);
|
|
|
|
my_b_printf(file,
|
|
|
|
"!! Don't know how to handle column type=%d meta=%d (%s)",
|
|
|
|
type, meta, tmp);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
*typestr= 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
Print a packed row into IO cache
|
|
|
|
|
|
|
|
@param[in] file IO cache
|
|
|
|
@param[in] td Table definition
|
|
|
|
@param[in] print_event_into Print parameters
|
|
|
|
@param[in] cols_bitmap Column bitmaps.
|
|
|
|
@param[in] value Pointer to packed row
|
|
|
|
@param[in] prefix Row's SQL clause ("SET", "WHERE", etc)
|
|
|
|
|
|
|
|
@retval - number of bytes scanned.
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
size_t
|
|
|
|
Rows_log_event::print_verbose_one_row(IO_CACHE *file, table_def *td,
|
|
|
|
PRINT_EVENT_INFO *print_event_info,
|
|
|
|
MY_BITMAP *cols_bitmap,
|
|
|
|
const uchar *value, const uchar *prefix)
|
|
|
|
{
|
|
|
|
const uchar *value0= value;
|
|
|
|
const uchar *null_bits= value;
|
|
|
|
char typestr[64]= "";
|
|
|
|
|
|
|
|
value+= (m_width + 7) / 8;
|
|
|
|
|
|
|
|
my_b_printf(file, "%s", prefix);
|
|
|
|
|
|
|
|
for (size_t i= 0; i < td->size(); i ++)
|
|
|
|
{
|
|
|
|
int is_null= (null_bits[i / 8] >> (i % 8)) & 0x01;
|
|
|
|
|
|
|
|
if (bitmap_is_set(cols_bitmap, i) == 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (is_null)
|
|
|
|
{
|
|
|
|
my_b_printf(file, "### @%d=NULL", i + 1);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
my_b_printf(file, "### @%d=", i + 1);
|
|
|
|
size_t size= log_event_print_value(file, value,
|
|
|
|
td->type(i), td->field_metadata(i),
|
|
|
|
typestr, sizeof(typestr));
|
|
|
|
if (!size)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
value+= size;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (print_event_info->verbose > 1)
|
|
|
|
{
|
|
|
|
my_b_printf(file, " /* ");
|
|
|
|
|
|
|
|
if (typestr[0])
|
|
|
|
my_b_printf(file, "%s ", typestr);
|
|
|
|
else
|
|
|
|
my_b_printf(file, "type=%d ", td->type(i));
|
|
|
|
|
|
|
|
my_b_printf(file, "meta=%d nullable=%d is_null=%d ",
|
|
|
|
td->field_metadata(i),
|
|
|
|
td->maybe_null(i), is_null);
|
|
|
|
my_b_printf(file, "*/");
|
|
|
|
}
|
|
|
|
|
|
|
|
my_b_printf(file, "\n");
|
|
|
|
}
|
|
|
|
return value - value0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
Print a row event into IO cache in human readable form (in SQL format)
|
|
|
|
|
|
|
|
@param[in] file IO cache
|
|
|
|
@param[in] print_event_into Print parameters
|
|
|
|
*/
|
|
|
|
void Rows_log_event::print_verbose(IO_CACHE *file,
|
|
|
|
PRINT_EVENT_INFO *print_event_info)
|
|
|
|
{
|
|
|
|
Table_map_log_event *map;
|
|
|
|
table_def *td;
|
|
|
|
const char *sql_command, *sql_clause1, *sql_clause2;
|
|
|
|
Log_event_type type_code= get_type_code();
|
|
|
|
|
|
|
|
switch (type_code) {
|
|
|
|
case WRITE_ROWS_EVENT:
|
|
|
|
sql_command= "INSERT INTO";
|
|
|
|
sql_clause1= "### SET\n";
|
|
|
|
sql_clause2= NULL;
|
|
|
|
break;
|
|
|
|
case DELETE_ROWS_EVENT:
|
|
|
|
sql_command= "DELETE FROM";
|
|
|
|
sql_clause1= "### WHERE\n";
|
|
|
|
sql_clause2= NULL;
|
|
|
|
break;
|
|
|
|
case UPDATE_ROWS_EVENT:
|
|
|
|
sql_command= "UPDATE";
|
|
|
|
sql_clause1= "### WHERE\n";
|
|
|
|
sql_clause2= "### SET\n";
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
sql_command= sql_clause1= sql_clause2= NULL;
|
|
|
|
DBUG_ASSERT(0); /* Not possible */
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!(map= print_event_info->m_table_map.get_table(m_table_id)) ||
|
|
|
|
!(td= map->create_table_def()))
|
|
|
|
{
|
|
|
|
my_b_printf(file, "### Row event for unknown table #%d", m_table_id);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (const uchar *value= m_rows_buf; value < m_rows_end; )
|
|
|
|
{
|
|
|
|
size_t length;
|
|
|
|
my_b_printf(file, "### %s %s.%s\n",
|
|
|
|
sql_command,
|
|
|
|
map->get_db_name(), map->get_table_name());
|
|
|
|
/* Print the first image */
|
|
|
|
if (!(length= print_verbose_one_row(file, td, print_event_info,
|
2008-08-22 07:17:52 +02:00
|
|
|
&m_cols, value,
|
2008-08-20 16:06:31 +02:00
|
|
|
(const uchar*) sql_clause1)))
|
|
|
|
goto end;
|
|
|
|
value+= length;
|
|
|
|
|
|
|
|
/* Print the second image (for UPDATE only) */
|
|
|
|
if (sql_clause2)
|
|
|
|
{
|
|
|
|
if (!(length= print_verbose_one_row(file, td, print_event_info,
|
2008-08-22 07:17:52 +02:00
|
|
|
&m_cols_ai, value,
|
2008-08-20 16:06:31 +02:00
|
|
|
(const uchar*) sql_clause2)))
|
|
|
|
goto end;
|
|
|
|
value+= length;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
end:
|
|
|
|
delete td;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef MYSQL_CLIENT
|
|
|
|
void free_table_map_log_event(Table_map_log_event *event)
|
|
|
|
{
|
|
|
|
delete event;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2006-10-06 10:17:02 +02:00
|
|
|
void Log_event::print_base64(IO_CACHE* file,
|
|
|
|
PRINT_EVENT_INFO* print_event_info,
|
|
|
|
bool more)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
const uchar *ptr= (const uchar *)temp_buf;
|
2006-11-30 02:40:42 +01:00
|
|
|
uint32 size= uint4korr(ptr + EVENT_LEN_OFFSET);
|
2006-10-06 10:17:02 +02:00
|
|
|
DBUG_ENTER("Log_event::print_base64");
|
|
|
|
|
2006-11-30 02:40:42 +01:00
|
|
|
size_t const tmp_str_sz= base64_needed_encoded_length((int) size);
|
2006-10-06 10:17:02 +02:00
|
|
|
char *const tmp_str= (char *) my_malloc(tmp_str_sz, MYF(MY_WME));
|
2005-12-22 06:39:02 +01:00
|
|
|
if (!tmp_str) {
|
|
|
|
fprintf(stderr, "\nError: Out of memory. "
|
|
|
|
"Could not print correct binlog event.\n");
|
2006-10-06 10:17:02 +02:00
|
|
|
DBUG_VOID_RETURN;
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
2006-10-06 10:17:02 +02:00
|
|
|
|
2007-02-23 12:13:55 +01:00
|
|
|
if (base64_encode(ptr, (size_t) size, tmp_str))
|
|
|
|
{
|
|
|
|
DBUG_ASSERT(0);
|
|
|
|
}
|
2006-10-06 10:17:02 +02:00
|
|
|
|
2008-08-21 13:47:23 +02:00
|
|
|
if (print_event_info->base64_output_mode != BASE64_OUTPUT_DECODE_ROWS)
|
|
|
|
{
|
|
|
|
if (my_b_tell(file) == 0)
|
|
|
|
my_b_printf(file, "\nBINLOG '\n");
|
2006-10-06 10:17:02 +02:00
|
|
|
|
2008-08-21 13:47:23 +02:00
|
|
|
my_b_printf(file, "%s\n", tmp_str);
|
2006-10-06 10:17:02 +02:00
|
|
|
|
2008-08-21 13:47:23 +02:00
|
|
|
if (!more)
|
|
|
|
my_b_printf(file, "'%s\n", print_event_info->delimiter);
|
|
|
|
}
|
|
|
|
|
2008-08-20 16:06:31 +02:00
|
|
|
if (print_event_info->verbose)
|
|
|
|
{
|
|
|
|
Rows_log_event *ev= NULL;
|
|
|
|
|
|
|
|
if (ptr[4] == TABLE_MAP_EVENT)
|
|
|
|
{
|
|
|
|
Table_map_log_event *map;
|
|
|
|
map= new Table_map_log_event((const char*) ptr, size,
|
|
|
|
glob_description_event);
|
|
|
|
print_event_info->m_table_map.set_table(map->get_table_id(), map);
|
|
|
|
}
|
|
|
|
else if (ptr[4] == WRITE_ROWS_EVENT)
|
|
|
|
{
|
|
|
|
ev= new Write_rows_log_event((const char*) ptr, size,
|
|
|
|
glob_description_event);
|
|
|
|
}
|
|
|
|
else if (ptr[4] == DELETE_ROWS_EVENT)
|
|
|
|
{
|
|
|
|
ev= new Delete_rows_log_event((const char*) ptr, size,
|
|
|
|
glob_description_event);
|
|
|
|
}
|
|
|
|
else if (ptr[4] == UPDATE_ROWS_EVENT)
|
|
|
|
{
|
|
|
|
ev= new Update_rows_log_event((const char*) ptr, size,
|
|
|
|
glob_description_event);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ev)
|
|
|
|
{
|
|
|
|
ev->print_verbose(file, print_event_info);
|
|
|
|
delete ev;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
my_free(tmp_str, MYF(0));
|
2006-10-06 10:17:02 +02:00
|
|
|
DBUG_VOID_RETURN;
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Log_event::print_timestamp()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2006-10-06 10:17:02 +02:00
|
|
|
void Log_event::print_timestamp(IO_CACHE* file, time_t* ts)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2001-09-15 04:03:16 +02:00
|
|
|
struct tm *res;
|
2006-10-06 10:17:02 +02:00
|
|
|
DBUG_ENTER("Log_event::print_timestamp");
|
2000-10-14 02:16:35 +02:00
|
|
|
if (!ts)
|
|
|
|
ts = &when;
|
2002-06-11 10:20:31 +02:00
|
|
|
#ifdef MYSQL_SERVER // This is always false
|
|
|
|
struct tm tm_tmp;
|
2001-09-06 01:23:01 +02:00
|
|
|
localtime_r(ts,(res= &tm_tmp));
|
2001-08-30 20:16:39 +02:00
|
|
|
#else
|
2001-09-04 00:25:34 +02:00
|
|
|
res=localtime(ts);
|
2001-08-30 20:16:39 +02:00
|
|
|
#endif
|
2000-10-14 02:16:35 +02:00
|
|
|
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(file,"%02d%02d%02d %2d:%02d:%02d",
|
|
|
|
res->tm_year % 100,
|
|
|
|
res->tm_mon+1,
|
|
|
|
res->tm_mday,
|
|
|
|
res->tm_hour,
|
|
|
|
res->tm_min,
|
|
|
|
res->tm_sec);
|
|
|
|
DBUG_VOID_RETURN;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
2003-08-11 21:44:43 +02:00
|
|
|
#endif /* MYSQL_CLIENT */
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
|
2007-10-19 14:18:41 +02:00
|
|
|
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
|
|
|
|
inline Log_event::enum_skip_reason
|
|
|
|
Log_event::continue_group(Relay_log_info *rli)
|
|
|
|
{
|
|
|
|
if (rli->slave_skip_counter == 1)
|
|
|
|
return Log_event::EVENT_SKIP_IGNORE;
|
|
|
|
return Log_event::do_shall_skip(rli);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2003-05-21 20:39:58 +02:00
|
|
|
/**************************************************************************
|
2003-05-19 15:35:49 +02:00
|
|
|
Query_log_event methods
|
2003-05-21 20:39:58 +02:00
|
|
|
**************************************************************************/
|
2000-09-29 00:24:50 +02:00
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2000-11-17 01:36:46 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
2004-11-12 04:01:46 +01:00
|
|
|
This (which is used only for SHOW BINLOG EVENTS) could be updated to
|
|
|
|
print SET @@session_var=. But this is not urgent, as SHOW BINLOG EVENTS is
|
|
|
|
only an information, it does not produce suitable queries to replay (for
|
|
|
|
example it does not print LOAD DATA INFILE).
|
2007-10-11 19:29:09 +02:00
|
|
|
@todo
|
|
|
|
show the catalog ??
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2002-12-11 08:17:51 +01:00
|
|
|
void Query_log_event::pack_info(Protocol *protocol)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
// TODO: show the catalog ??
|
2003-01-17 13:39:29 +01:00
|
|
|
char *buf, *pos;
|
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 (!(buf= (char*) my_malloc(9 + db_len + q_len, MYF(MY_WME))))
|
2003-01-17 13:39:29 +01:00
|
|
|
return;
|
2005-02-17 13:52:16 +01:00
|
|
|
pos= buf;
|
|
|
|
if (!(flags & LOG_EVENT_SUPPRESS_USE_F)
|
2004-12-03 12:13:51 +01:00
|
|
|
&& db && db_len)
|
2001-11-18 01:23:46 +01:00
|
|
|
{
|
2003-01-17 13:39:29 +01:00
|
|
|
pos= strmov(buf, "use `");
|
|
|
|
memcpy(pos, db, db_len);
|
2003-08-11 21:44:43 +02:00
|
|
|
pos= strmov(pos+db_len, "`; ");
|
2001-11-18 01:23:46 +01:00
|
|
|
}
|
2002-10-30 07:50:07 +01:00
|
|
|
if (query && q_len)
|
2003-01-17 13:39:29 +01:00
|
|
|
{
|
|
|
|
memcpy(pos, query, q_len);
|
|
|
|
pos+= q_len;
|
|
|
|
}
|
2003-03-18 08:34:19 +01:00
|
|
|
protocol->store(buf, pos-buf, &my_charset_bin);
|
2003-01-17 13:39:29 +01:00
|
|
|
my_free(buf, MYF(MY_ALLOW_ZERO_PTR));
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
2003-01-15 09:11:44 +01:00
|
|
|
#endif
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2005-03-22 00:26:12 +01:00
|
|
|
#ifndef MYSQL_CLIENT
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
Utility function for the next method (Query_log_event::write()) .
|
|
|
|
*/
|
2005-05-05 14:20:53 +02:00
|
|
|
static void write_str_with_code_and_len(char **dst, const char *src,
|
|
|
|
int len, uint code)
|
|
|
|
{
|
2008-08-26 12:01:49 +02:00
|
|
|
/*
|
|
|
|
only 1 byte to store the length of catalog, so it should not
|
|
|
|
surpass 255
|
|
|
|
*/
|
|
|
|
DBUG_ASSERT(len <= 255);
|
2005-05-05 14:20:53 +02:00
|
|
|
DBUG_ASSERT(src);
|
|
|
|
*((*dst)++)= code;
|
|
|
|
*((*dst)++)= (uchar) len;
|
|
|
|
bmove(*dst, src, len);
|
|
|
|
(*dst)+= len;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
Query_log_event::write().
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@note
|
2004-11-12 04:01:46 +01:00
|
|
|
In this event we have to modify the header to have the correct
|
|
|
|
EVENT_LEN_OFFSET as we don't yet know how many status variables we
|
|
|
|
will print!
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
bool Query_log_event::write(IO_CACHE* file)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2008-08-26 12:01:49 +02:00
|
|
|
uchar buf[QUERY_HEADER_LEN + MAX_SIZE_LOG_EVENT_STATUS];
|
|
|
|
uchar *start, *start_of_status;
|
2004-11-12 04:01:46 +01:00
|
|
|
ulong event_length;
|
2003-11-04 08:40:36 +01:00
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
if (!query)
|
2004-11-12 04:01:46 +01:00
|
|
|
return 1; // Something wrong with event
|
|
|
|
|
2003-11-04 08:40:36 +01:00
|
|
|
/*
|
|
|
|
We want to store the thread id:
|
|
|
|
(- as an information for the user when he reads the binlog)
|
|
|
|
- if the query uses temporary table: for the slave SQL thread to know to
|
|
|
|
which master connection the temp table belongs.
|
2004-11-12 04:01:46 +01:00
|
|
|
Now imagine we (write()) are called by the slave SQL thread (we are
|
2003-11-04 08:40:36 +01:00
|
|
|
logging a query executed by this thread; the slave runs with
|
|
|
|
--log-slave-updates). Then this query will be logged with
|
|
|
|
thread_id=the_thread_id_of_the_SQL_thread. Imagine that 2 temp tables of
|
|
|
|
the same name were created simultaneously on the master (in the master
|
|
|
|
binlog you have
|
|
|
|
CREATE TEMPORARY TABLE t; (thread 1)
|
|
|
|
CREATE TEMPORARY TABLE t; (thread 2)
|
|
|
|
...)
|
|
|
|
then in the slave's binlog there will be
|
|
|
|
CREATE TEMPORARY TABLE t; (thread_id_of_the_slave_SQL_thread)
|
|
|
|
CREATE TEMPORARY TABLE t; (thread_id_of_the_slave_SQL_thread)
|
|
|
|
which is bad (same thread id!).
|
|
|
|
|
|
|
|
To avoid this, we log the thread's thread id EXCEPT for the SQL
|
|
|
|
slave thread for which we log the original (master's) thread id.
|
|
|
|
Now this moves the bug: what happens if the thread id on the
|
|
|
|
master was 10 and when the slave replicates the query, a
|
|
|
|
connection number 10 is opened by a normal client on the slave,
|
|
|
|
and updates a temp table of the same name? We get a problem
|
|
|
|
again. To avoid this, in the handling of temp tables (sql_base.cc)
|
|
|
|
we use thread_id AND server_id. TODO when this is merged into
|
|
|
|
4.1: in 4.1, slave_proxy_id has been renamed to pseudo_thread_id
|
|
|
|
and is a session variable: that's to make mysqlbinlog work with
|
|
|
|
temp tables. We probably need to introduce
|
|
|
|
|
|
|
|
SET PSEUDO_SERVER_ID
|
|
|
|
for mysqlbinlog in 4.1. mysqlbinlog would print:
|
|
|
|
SET PSEUDO_SERVER_ID=
|
|
|
|
SET PSEUDO_THREAD_ID=
|
|
|
|
for each query using temp tables.
|
|
|
|
*/
|
|
|
|
int4store(buf + Q_THREAD_ID_OFFSET, slave_proxy_id);
|
2002-10-30 07:50:07 +01:00
|
|
|
int4store(buf + Q_EXEC_TIME_OFFSET, exec_time);
|
|
|
|
buf[Q_DB_LEN_OFFSET] = (char) db_len;
|
|
|
|
int2store(buf + Q_ERR_CODE_OFFSET, error_code);
|
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
/*
|
|
|
|
You MUST always write status vars in increasing order of code. This
|
|
|
|
guarantees that a slightly older slave will be able to parse those he
|
|
|
|
knows.
|
|
|
|
*/
|
|
|
|
start_of_status= start= buf+QUERY_HEADER_LEN;
|
|
|
|
if (flags2_inited)
|
|
|
|
{
|
2005-03-22 00:26:12 +01:00
|
|
|
*start++= Q_FLAGS2_CODE;
|
2004-11-12 04:01:46 +01:00
|
|
|
int4store(start, flags2);
|
|
|
|
start+= 4;
|
|
|
|
}
|
|
|
|
if (sql_mode_inited)
|
|
|
|
{
|
2005-03-22 00:26:12 +01:00
|
|
|
*start++= Q_SQL_MODE_CODE;
|
2005-02-23 18:58:49 +01:00
|
|
|
int8store(start, (ulonglong)sql_mode);
|
2004-11-12 04:01:46 +01:00
|
|
|
start+= 8;
|
|
|
|
}
|
2005-05-05 14:20:53 +02:00
|
|
|
if (catalog_len) // i.e. this var is inited (false for 4.0 events)
|
2004-11-12 04:01:46 +01:00
|
|
|
{
|
2005-05-05 14:20:53 +02:00
|
|
|
write_str_with_code_and_len((char **)(&start),
|
|
|
|
catalog, catalog_len, Q_CATALOG_NZ_CODE);
|
2004-11-12 04:01:46 +01:00
|
|
|
/*
|
2005-03-25 14:51:17 +01:00
|
|
|
In 5.0.x where x<4 masters we used to store the end zero here. This was
|
|
|
|
a waste of one byte so we don't do it in x>=4 masters. We change code to
|
|
|
|
Q_CATALOG_NZ_CODE, because re-using the old code would make x<4 slaves
|
|
|
|
of this x>=4 master segfault (expecting a zero when there is
|
|
|
|
none). Remaining compatibility problems are: the older slave will not
|
|
|
|
find the catalog; but it is will not crash, and it's not an issue
|
2005-03-30 15:00:31 +02:00
|
|
|
that it does not find the catalog as catalogs were not used in these
|
|
|
|
older MySQL versions (we store it in binlog and read it from relay log
|
|
|
|
but do nothing useful with it). What is an issue is that the older slave
|
|
|
|
will stop processing the Q_* blocks (and jumps to the db/query) as soon
|
|
|
|
as it sees unknown Q_CATALOG_NZ_CODE; so it will not be able to read
|
2005-03-25 14:51:17 +01:00
|
|
|
Q_AUTO_INCREMENT*, Q_CHARSET and so replication will fail silently in
|
|
|
|
various ways. Documented that you should not mix alpha/beta versions if
|
2005-03-29 17:26:38 +02:00
|
|
|
they are not exactly the same version, with example of 5.0.3->5.0.2 and
|
|
|
|
5.0.4->5.0.3. If replication is from older to new, the new will
|
|
|
|
recognize Q_CATALOG_CODE and have no problem.
|
2004-11-12 04:01:46 +01:00
|
|
|
*/
|
|
|
|
}
|
2008-03-07 13:59:36 +01:00
|
|
|
if (auto_increment_increment != 1 || auto_increment_offset != 1)
|
2004-11-12 04:01:46 +01:00
|
|
|
{
|
|
|
|
*start++= Q_AUTO_INCREMENT;
|
|
|
|
int2store(start, auto_increment_increment);
|
|
|
|
int2store(start+2, auto_increment_offset);
|
|
|
|
start+= 4;
|
|
|
|
}
|
2005-02-03 16:22:16 +01:00
|
|
|
if (charset_inited)
|
|
|
|
{
|
2005-03-22 00:26:12 +01:00
|
|
|
*start++= Q_CHARSET_CODE;
|
2005-02-03 16:22:16 +01:00
|
|
|
memcpy(start, charset, 6);
|
|
|
|
start+= 6;
|
|
|
|
}
|
2005-03-22 00:26:12 +01:00
|
|
|
if (time_zone_len)
|
|
|
|
{
|
|
|
|
/* In the TZ sys table, column Name is of length 64 so this should be ok */
|
|
|
|
DBUG_ASSERT(time_zone_len <= MAX_TIME_ZONE_NAME_LENGTH);
|
2008-08-26 12:01:49 +02:00
|
|
|
write_str_with_code_and_len((char **)(&start),
|
|
|
|
time_zone_str, time_zone_len, Q_TIME_ZONE_CODE);
|
2005-03-22 00:26:12 +01:00
|
|
|
}
|
2006-12-07 06:31:53 +01:00
|
|
|
if (lc_time_names_number)
|
|
|
|
{
|
|
|
|
DBUG_ASSERT(lc_time_names_number <= 0xFFFF);
|
|
|
|
*start++= Q_LC_TIME_NAMES_CODE;
|
|
|
|
int2store(start, lc_time_names_number);
|
|
|
|
start+= 2;
|
|
|
|
}
|
2007-02-28 14:06:57 +01:00
|
|
|
if (charset_database_number)
|
|
|
|
{
|
|
|
|
DBUG_ASSERT(charset_database_number <= 0xFFFF);
|
|
|
|
*start++= Q_CHARSET_DATABASE_CODE;
|
|
|
|
int2store(start, charset_database_number);
|
|
|
|
start+= 2;
|
|
|
|
}
|
2008-08-26 12:01:49 +02:00
|
|
|
if (table_map_for_update)
|
|
|
|
{
|
|
|
|
*start++= Q_TABLE_MAP_FOR_UPDATE_CODE;
|
|
|
|
int8store(start, table_map_for_update);
|
|
|
|
start+= 8;
|
|
|
|
}
|
2004-11-12 04:01:46 +01:00
|
|
|
/*
|
2008-08-26 12:01:49 +02:00
|
|
|
NOTE: When adding new status vars, please don't forget to update
|
|
|
|
the MAX_SIZE_LOG_EVENT_STATUS in log_event.h and update function
|
|
|
|
code_name in this file.
|
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
Here there could be code like
|
2005-02-03 16:22:16 +01:00
|
|
|
if (command-line-option-which-says-"log_this_variable" && inited)
|
2004-11-12 04:01:46 +01:00
|
|
|
{
|
2005-03-22 00:26:12 +01:00
|
|
|
*start++= Q_THIS_VARIABLE_CODE;
|
2004-11-12 04:01:46 +01:00
|
|
|
int4store(start, this_variable);
|
|
|
|
start+= 4;
|
|
|
|
}
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Store length of status variables */
|
|
|
|
status_vars_len= (uint) (start-start_of_status);
|
2006-11-14 11:48:17 +01:00
|
|
|
DBUG_ASSERT(status_vars_len <= MAX_SIZE_LOG_EVENT_STATUS);
|
2004-11-12 04:01:46 +01:00
|
|
|
int2store(buf + Q_STATUS_VARS_LEN_OFFSET, status_vars_len);
|
|
|
|
|
|
|
|
/*
|
|
|
|
Calculate length of whole event
|
|
|
|
The "1" below is the \0 in the db's length
|
|
|
|
*/
|
2005-03-16 02:32:47 +01:00
|
|
|
event_length= (uint) (start-buf) + get_post_header_size_for_derived() + db_len + 1 + q_len;
|
2004-11-12 04:01:46 +01:00
|
|
|
|
|
|
|
return (write_header(file, event_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
|
|
|
my_b_safe_write(file, (uchar*) buf, QUERY_HEADER_LEN) ||
|
2005-03-16 02:32:47 +01:00
|
|
|
write_post_header_for_derived(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
|
|
|
my_b_safe_write(file, (uchar*) start_of_status,
|
2005-03-16 02:32:47 +01:00
|
|
|
(uint) (start-start_of_status)) ||
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
my_b_safe_write(file, (db) ? (uchar*) db : (uchar*)"", db_len + 1) ||
|
|
|
|
my_b_safe_write(file, (uchar*) query, q_len)) ? 1 : 0;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
2006-06-12 14:54:45 +02:00
|
|
|
The simplest constructor that could possibly work. This is used for
|
|
|
|
creating static objects that have a special meaning and are invisible
|
|
|
|
to the log.
|
|
|
|
*/
|
|
|
|
Query_log_event::Query_log_event()
|
|
|
|
:Log_event(), data_buf(0)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2007-05-28 21:20:22 +02:00
|
|
|
SYNOPSIS
|
|
|
|
Query_log_event::Query_log_event()
|
2007-08-14 14:20:05 +02:00
|
|
|
thd_arg - thread handle
|
2007-05-28 21:20:22 +02:00
|
|
|
query_arg - array of char representing the query
|
|
|
|
query_length - size of the `query_arg' array
|
|
|
|
using_trans - there is a modified transactional table
|
|
|
|
suppress_use - suppress the generation of 'USE' statements
|
|
|
|
killed_status_arg - an optional with default to THD::KILLED_NO_VALUE
|
|
|
|
if the value is different from the default, the arg
|
|
|
|
is set to the current thd->killed value.
|
|
|
|
A caller might need to masquerade thd->killed with
|
|
|
|
THD::NOT_KILLED.
|
|
|
|
DESCRIPTION
|
|
|
|
Creates an event for binlogging
|
|
|
|
The value for local `killed_status' can be supplied by caller.
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2001-08-03 23:57:53 +02:00
|
|
|
Query_log_event::Query_log_event(THD* thd_arg, const char* query_arg,
|
2004-12-03 12:13:51 +01:00
|
|
|
ulong query_length, bool using_trans,
|
2007-08-14 14:20:05 +02:00
|
|
|
bool suppress_use,
|
|
|
|
THD::killed_state killed_status_arg)
|
2005-01-16 13:16:23 +01:00
|
|
|
:Log_event(thd_arg,
|
2007-08-14 14:20:05 +02:00
|
|
|
(thd_arg->thread_specific_used ? LOG_EVENT_THREAD_SPECIFIC_F :
|
|
|
|
0) |
|
|
|
|
(suppress_use ? LOG_EVENT_SUPPRESS_USE_F : 0),
|
2004-12-03 12:13:51 +01:00
|
|
|
using_trans),
|
2004-11-12 04:01:46 +01:00
|
|
|
data_buf(0), query(query_arg), catalog(thd_arg->catalog),
|
2002-11-07 03:02:37 +01:00
|
|
|
db(thd_arg->db), q_len((uint32) query_length),
|
2003-10-29 14:23:35 +01:00
|
|
|
thread_id(thd_arg->thread_id),
|
|
|
|
/* save the original thread id; we already know the server id */
|
2004-11-12 04:01:46 +01:00
|
|
|
slave_proxy_id(thd_arg->variables.pseudo_thread_id),
|
2005-02-03 16:22:16 +01:00
|
|
|
flags2_inited(1), sql_mode_inited(1), charset_inited(1),
|
2004-11-12 04:01:46 +01:00
|
|
|
sql_mode(thd_arg->variables.sql_mode),
|
|
|
|
auto_increment_increment(thd_arg->variables.auto_increment_increment),
|
2006-12-07 06:31:53 +01:00
|
|
|
auto_increment_offset(thd_arg->variables.auto_increment_offset),
|
2007-02-28 14:06:57 +01:00
|
|
|
lc_time_names_number(thd_arg->variables.lc_time_names->number),
|
2008-08-26 12:01:49 +02:00
|
|
|
charset_database_number(0),
|
|
|
|
table_map_for_update((ulonglong)thd_arg->table_map_for_update)
|
2002-06-11 10:20:31 +02:00
|
|
|
{
|
|
|
|
time_t end_time;
|
2007-05-28 21:20:22 +02:00
|
|
|
|
|
|
|
if (killed_status_arg == THD::KILLED_NO_VALUE)
|
|
|
|
killed_status_arg= thd_arg->killed;
|
|
|
|
error_code=
|
2007-12-12 16:21:01 +01:00
|
|
|
(killed_status_arg == THD::NOT_KILLED) ?
|
|
|
|
(thd_arg->is_error() ? thd_arg->main_da.sql_errno() : 0) :
|
2007-05-28 21:20:22 +02:00
|
|
|
((thd_arg->system_thread & SYSTEM_THREAD_DELAYED_INSERT) ? 0 :
|
2007-08-14 14:20:05 +02:00
|
|
|
thd_arg->killed_errno());
|
2007-05-28 21:20:22 +02:00
|
|
|
|
2002-06-11 10:20:31 +02:00
|
|
|
time(&end_time);
|
2007-08-14 14:20:05 +02:00
|
|
|
exec_time = (ulong) (end_time - thd_arg->start_time);
|
2007-10-25 11:58:18 +02:00
|
|
|
/**
|
|
|
|
@todo this means that if we have no catalog, then it is replicated
|
|
|
|
as an existing catalog of length zero. is that safe? /sven
|
|
|
|
*/
|
2004-11-12 04:01:46 +01:00
|
|
|
catalog_len = (catalog) ? (uint32) strlen(catalog) : 0;
|
2005-02-03 16:22:16 +01:00
|
|
|
/* status_vars_len is set just before writing the event */
|
2002-06-11 10:20:31 +02:00
|
|
|
db_len = (db) ? (uint32) strlen(db) : 0;
|
2007-02-28 14:06:57 +01:00
|
|
|
if (thd_arg->variables.collation_database != thd_arg->db_charset)
|
|
|
|
charset_database_number= thd_arg->variables.collation_database->number;
|
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
/*
|
|
|
|
If we don't use flags2 for anything else than options contained in
|
2007-08-14 14:20:05 +02:00
|
|
|
thd_arg->options, it would be more efficient to flags2=thd_arg->options
|
2007-10-25 11:58:18 +02:00
|
|
|
(OPTIONS_WRITTEN_TO_BIN_LOG would be used only at reading time).
|
2004-11-12 04:01:46 +01:00
|
|
|
But it's likely that we don't want to use 32 bits for 3 bits; in the future
|
|
|
|
we will probably want to reclaim the 29 bits. So we need the &.
|
|
|
|
*/
|
2005-10-14 10:44:46 +02:00
|
|
|
flags2= (uint32) (thd_arg->options & OPTIONS_WRITTEN_TO_BIN_LOG);
|
2007-08-14 14:20:05 +02:00
|
|
|
DBUG_ASSERT(thd_arg->variables.character_set_client->number < 256*256);
|
|
|
|
DBUG_ASSERT(thd_arg->variables.collation_connection->number < 256*256);
|
|
|
|
DBUG_ASSERT(thd_arg->variables.collation_server->number < 256*256);
|
2007-11-28 12:35:25 +01:00
|
|
|
DBUG_ASSERT(thd_arg->variables.character_set_client->mbminlen == 1);
|
2005-02-03 16:22:16 +01:00
|
|
|
int2store(charset, thd_arg->variables.character_set_client->number);
|
|
|
|
int2store(charset+2, thd_arg->variables.collation_connection->number);
|
|
|
|
int2store(charset+4, thd_arg->variables.collation_server->number);
|
2005-03-22 00:26:12 +01:00
|
|
|
if (thd_arg->time_zone_used)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Note that our event becomes dependent on the Time_zone object
|
|
|
|
representing the time zone. Fortunately such objects are never deleted
|
|
|
|
or changed during mysqld's lifetime.
|
|
|
|
*/
|
|
|
|
time_zone_len= thd_arg->variables.time_zone->get_name()->length();
|
|
|
|
time_zone_str= thd_arg->variables.time_zone->get_name()->ptr();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
time_zone_len= 0;
|
2006-11-20 21:42:06 +01:00
|
|
|
DBUG_PRINT("info",("Query_log_event has flags2: %lu sql_mode: %lu",
|
|
|
|
(ulong) flags2, sql_mode));
|
2002-06-11 10:20:31 +02:00
|
|
|
}
|
2003-05-19 15:35:49 +02:00
|
|
|
#endif /* MYSQL_CLIENT */
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2003-08-11 21:44:43 +02:00
|
|
|
|
2005-05-05 14:20:53 +02:00
|
|
|
/* 2 utility functions for the next method */
|
|
|
|
|
2007-11-09 13:43:09 +01:00
|
|
|
/**
|
|
|
|
Read a string with length from memory.
|
|
|
|
|
|
|
|
This function reads the string-with-length stored at
|
|
|
|
<code>src</code> and extract the length into <code>*len</code> and
|
|
|
|
a pointer to the start of the string into <code>*dst</code>. The
|
|
|
|
string can then be copied using <code>memcpy()</code> with the
|
|
|
|
number of bytes given in <code>*len</code>.
|
|
|
|
|
|
|
|
@param src Pointer to variable holding a pointer to the memory to
|
|
|
|
read the string from.
|
|
|
|
@param dst Pointer to variable holding a pointer where the actual
|
|
|
|
string starts. Starting from this position, the string
|
|
|
|
can be copied using @c memcpy().
|
|
|
|
@param len Pointer to variable where the length will be stored.
|
|
|
|
@param end One-past-the-end of the memory where the string is
|
|
|
|
stored.
|
|
|
|
|
|
|
|
@return Zero if the entire string can be copied successfully,
|
|
|
|
@c UINT_MAX if the length could not be read from memory
|
|
|
|
(that is, if <code>*src >= end</code>), otherwise the
|
|
|
|
number of bytes that are missing to read the full
|
|
|
|
string, which happends <code>*dst + *len >= end</code>.
|
2007-01-10 18:20:13 +01:00
|
|
|
*/
|
2007-11-09 13:43:09 +01:00
|
|
|
static int
|
|
|
|
get_str_len_and_pointer(const Log_event::Byte **src,
|
|
|
|
const char **dst,
|
|
|
|
uint *len,
|
|
|
|
const Log_event::Byte *end)
|
2005-05-05 14:20:53 +02:00
|
|
|
{
|
2007-11-09 13:43:09 +01:00
|
|
|
if (*src >= end)
|
|
|
|
return -1; // Will be UINT_MAX in two-complement arithmetics
|
|
|
|
uint length= **src;
|
|
|
|
if (length > 0)
|
|
|
|
{
|
|
|
|
if (*src + length >= end)
|
2007-11-12 22:02:12 +01:00
|
|
|
return *src + length - end + 1; // Number of bytes missing
|
2007-11-09 13:43:09 +01:00
|
|
|
*dst= (char *)*src + 1; // Will be copied later
|
|
|
|
}
|
|
|
|
*len= length;
|
2007-11-12 22:02:12 +01:00
|
|
|
*src+= length + 1;
|
|
|
|
return 0;
|
2005-05-05 14:20:53 +02:00
|
|
|
}
|
|
|
|
|
2007-01-10 18:20:13 +01:00
|
|
|
static void copy_str_and_move(const char **src,
|
|
|
|
Log_event::Byte **dst,
|
|
|
|
uint len)
|
2005-05-05 14:20:53 +02:00
|
|
|
{
|
|
|
|
memcpy(*dst, *src, len);
|
2007-01-10 18:20:13 +01:00
|
|
|
*src= (const char *)*dst;
|
2005-05-05 14:20:53 +02:00
|
|
|
(*dst)+= len;
|
|
|
|
*(*dst)++= 0;
|
|
|
|
}
|
|
|
|
|
2007-11-09 13:43:09 +01:00
|
|
|
|
2007-11-13 09:43:29 +01:00
|
|
|
#ifndef DBUG_OFF
|
2007-11-13 09:01:42 +01:00
|
|
|
static char const *
|
|
|
|
code_name(int code)
|
|
|
|
{
|
|
|
|
static char buf[255];
|
2007-11-12 22:02:12 +01:00
|
|
|
switch (code) {
|
|
|
|
case Q_FLAGS2_CODE: return "Q_FLAGS2_CODE";
|
|
|
|
case Q_SQL_MODE_CODE: return "Q_SQL_MODE_CODE";
|
|
|
|
case Q_CATALOG_CODE: return "Q_CATALOG_CODE";
|
|
|
|
case Q_AUTO_INCREMENT: return "Q_AUTO_INCREMENT";
|
|
|
|
case Q_CHARSET_CODE: return "Q_CHARSET_CODE";
|
|
|
|
case Q_TIME_ZONE_CODE: return "Q_TIME_ZONE_CODE";
|
|
|
|
case Q_CATALOG_NZ_CODE: return "Q_CATALOG_NZ_CODE";
|
|
|
|
case Q_LC_TIME_NAMES_CODE: return "Q_LC_TIME_NAMES_CODE";
|
|
|
|
case Q_CHARSET_DATABASE_CODE: return "Q_CHARSET_DATABASE_CODE";
|
2008-08-26 12:01:49 +02:00
|
|
|
case Q_TABLE_MAP_FOR_UPDATE_CODE: return "Q_TABLE_MAP_FOR_UPDATE_CODE";
|
2007-11-12 22:02:12 +01:00
|
|
|
}
|
|
|
|
sprintf(buf, "CODE#%d", code);
|
|
|
|
return buf;
|
|
|
|
}
|
2007-11-13 09:43:29 +01:00
|
|
|
#endif
|
2007-11-12 22:02:12 +01:00
|
|
|
|
2007-11-09 13:43:09 +01:00
|
|
|
/**
|
|
|
|
Macro to check that there is enough space to read from memory.
|
|
|
|
|
|
|
|
@param PTR Pointer to memory
|
|
|
|
@param END End of memory
|
|
|
|
@param CNT Number of bytes that should be read.
|
|
|
|
*/
|
2007-11-12 22:02:12 +01:00
|
|
|
#define CHECK_SPACE(PTR,END,CNT) \
|
|
|
|
do { \
|
|
|
|
DBUG_PRINT("info", ("Read %s", code_name(pos[-1]))); \
|
|
|
|
DBUG_ASSERT((PTR) + (CNT) <= (END)); \
|
|
|
|
if ((PTR) + (CNT) > (END)) { \
|
|
|
|
DBUG_PRINT("info", ("query= 0")); \
|
|
|
|
query= 0; \
|
|
|
|
DBUG_VOID_RETURN; \
|
|
|
|
} \
|
2007-11-09 13:43:09 +01:00
|
|
|
} while (0)
|
|
|
|
|
2007-12-14 16:52:10 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
2004-11-12 04:01:46 +01:00
|
|
|
This is used by the SQL slave thread to prepare the event before execution.
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2004-11-12 04:01:46 +01:00
|
|
|
Query_log_event::Query_log_event(const char* buf, uint event_len,
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
const Format_description_log_event
|
|
|
|
*description_event,
|
2005-03-16 02:32:47 +01:00
|
|
|
Log_event_type event_type)
|
2005-03-22 00:26:12 +01:00
|
|
|
:Log_event(buf, description_event), data_buf(0), query(NullS),
|
2004-11-12 04:01:46 +01:00
|
|
|
db(NullS), catalog_len(0), status_vars_len(0),
|
2005-02-03 16:22:16 +01:00
|
|
|
flags2_inited(0), sql_mode_inited(0), charset_inited(0),
|
2005-03-22 00:26:12 +01:00
|
|
|
auto_increment_increment(1), auto_increment_offset(1),
|
2008-08-26 12:01:49 +02:00
|
|
|
time_zone_len(0), lc_time_names_number(0), charset_database_number(0),
|
|
|
|
table_map_for_update(0)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
ulong data_len;
|
2004-11-12 04:01:46 +01:00
|
|
|
uint32 tmp;
|
|
|
|
uint8 common_header_len, post_header_len;
|
2007-01-10 18:20:13 +01:00
|
|
|
Log_event::Byte *start;
|
|
|
|
const Log_event::Byte *end;
|
2005-03-29 17:26:38 +02:00
|
|
|
bool catalog_nz= 1;
|
2004-11-12 04:01:46 +01:00
|
|
|
DBUG_ENTER("Query_log_event::Query_log_event(char*,...)");
|
|
|
|
|
|
|
|
common_header_len= description_event->common_header_len;
|
2005-03-16 02:32:47 +01:00
|
|
|
post_header_len= description_event->post_header_len[event_type-1];
|
2006-11-20 21:42:06 +01:00
|
|
|
DBUG_PRINT("info",("event_len: %u common_header_len: %d post_header_len: %d",
|
2004-11-12 04:01:46 +01:00
|
|
|
event_len, common_header_len, post_header_len));
|
|
|
|
|
|
|
|
/*
|
|
|
|
We test if the event's length is sensible, and if so we compute data_len.
|
|
|
|
We cannot rely on QUERY_HEADER_LEN here as it would not be format-tolerant.
|
|
|
|
We use QUERY_HEADER_MINIMAL_LEN which is the same for 3.23, 4.0 & 5.0.
|
|
|
|
*/
|
|
|
|
if (event_len < (uint)(common_header_len + post_header_len))
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
data_len = event_len - (common_header_len + post_header_len);
|
|
|
|
buf+= common_header_len;
|
|
|
|
|
|
|
|
slave_proxy_id= thread_id = uint4korr(buf + Q_THREAD_ID_OFFSET);
|
|
|
|
exec_time = uint4korr(buf + Q_EXEC_TIME_OFFSET);
|
2005-03-22 00:26:12 +01:00
|
|
|
db_len = (uint)buf[Q_DB_LEN_OFFSET]; // TODO: add a check of all *_len vars
|
2004-11-12 04:01:46 +01:00
|
|
|
error_code = uint2korr(buf + Q_ERR_CODE_OFFSET);
|
|
|
|
|
|
|
|
/*
|
|
|
|
5.0 format starts here.
|
|
|
|
Depending on the format, we may or not have affected/warnings etc
|
|
|
|
The remnent post-header to be parsed has length:
|
|
|
|
*/
|
|
|
|
tmp= post_header_len - QUERY_HEADER_MINIMAL_LEN;
|
|
|
|
if (tmp)
|
2001-11-18 01:23:46 +01:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
status_vars_len= uint2korr(buf + Q_STATUS_VARS_LEN_OFFSET);
|
2007-11-09 13:43:09 +01:00
|
|
|
/*
|
|
|
|
Check if status variable length is corrupt and will lead to very
|
|
|
|
wrong data. We could be even more strict and require data_len to
|
|
|
|
be even bigger, but this will suffice to catch most corruption
|
|
|
|
errors that can lead to a crash.
|
|
|
|
*/
|
2007-11-12 22:02:12 +01:00
|
|
|
if (status_vars_len > min(data_len, MAX_SIZE_LOG_EVENT_STATUS))
|
2007-11-09 13:43:09 +01:00
|
|
|
{
|
2007-11-13 09:01:42 +01:00
|
|
|
DBUG_PRINT("info", ("status_vars_len (%u) > data_len (%lu); query= 0",
|
2007-11-12 22:02:12 +01:00
|
|
|
status_vars_len, data_len));
|
2007-11-09 13:43:09 +01:00
|
|
|
query= 0;
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
2004-11-12 04:01:46 +01:00
|
|
|
data_len-= status_vars_len;
|
|
|
|
DBUG_PRINT("info", ("Query_log_event has status_vars_len: %u",
|
|
|
|
(uint) status_vars_len));
|
|
|
|
tmp-= 2;
|
2001-11-18 01:23:46 +01:00
|
|
|
}
|
2005-03-16 02:32:47 +01:00
|
|
|
/*
|
|
|
|
We have parsed everything we know in the post header for QUERY_EVENT,
|
|
|
|
the rest of post header is either comes from older version MySQL or
|
|
|
|
dedicated to derived events (e.g. Execute_load_query...)
|
|
|
|
*/
|
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
/* variable-part: the status vars; only in MySQL 5.0 */
|
|
|
|
|
2007-01-10 18:20:13 +01:00
|
|
|
start= (Log_event::Byte*) (buf+post_header_len);
|
|
|
|
end= (const Log_event::Byte*) (start+status_vars_len);
|
|
|
|
for (const Log_event::Byte* pos= start; pos < end;)
|
2001-11-18 01:23:46 +01:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
switch (*pos++) {
|
|
|
|
case Q_FLAGS2_CODE:
|
2007-11-09 13:43:09 +01:00
|
|
|
CHECK_SPACE(pos, end, 4);
|
2004-11-12 04:01:46 +01:00
|
|
|
flags2_inited= 1;
|
|
|
|
flags2= uint4korr(pos);
|
2006-11-20 21:42:06 +01:00
|
|
|
DBUG_PRINT("info",("In Query_log_event, read flags2: %lu", (ulong) flags2));
|
2004-11-12 04:01:46 +01:00
|
|
|
pos+= 4;
|
|
|
|
break;
|
|
|
|
case Q_SQL_MODE_CODE:
|
|
|
|
{
|
|
|
|
#ifndef DBUG_OFF
|
|
|
|
char buff[22];
|
|
|
|
#endif
|
2007-11-09 13:43:09 +01:00
|
|
|
CHECK_SPACE(pos, end, 8);
|
2004-11-12 04:01:46 +01:00
|
|
|
sql_mode_inited= 1;
|
|
|
|
sql_mode= (ulong) uint8korr(pos); // QQ: Fix when sql_mode is ulonglong
|
|
|
|
DBUG_PRINT("info",("In Query_log_event, read sql_mode: %s",
|
|
|
|
llstr(sql_mode, buff)));
|
|
|
|
pos+= 8;
|
|
|
|
break;
|
|
|
|
}
|
2005-03-25 14:51:17 +01:00
|
|
|
case Q_CATALOG_NZ_CODE:
|
2007-11-12 22:02:12 +01:00
|
|
|
DBUG_PRINT("info", ("case Q_CATALOG_NZ_CODE; pos: 0x%lx; end: 0x%lx",
|
2007-11-13 09:01:42 +01:00
|
|
|
(ulong) pos, (ulong) end));
|
2007-11-09 13:43:09 +01:00
|
|
|
if (get_str_len_and_pointer(&pos, &catalog, &catalog_len, end))
|
|
|
|
{
|
2007-11-12 22:02:12 +01:00
|
|
|
DBUG_PRINT("info", ("query= 0"));
|
2007-11-09 13:43:09 +01:00
|
|
|
query= 0;
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
2004-11-12 04:01:46 +01:00
|
|
|
break;
|
|
|
|
case Q_AUTO_INCREMENT:
|
2007-11-09 13:43:09 +01:00
|
|
|
CHECK_SPACE(pos, end, 4);
|
2004-11-12 04:01:46 +01:00
|
|
|
auto_increment_increment= uint2korr(pos);
|
|
|
|
auto_increment_offset= uint2korr(pos+2);
|
|
|
|
pos+= 4;
|
|
|
|
break;
|
2005-02-03 16:22:16 +01:00
|
|
|
case Q_CHARSET_CODE:
|
|
|
|
{
|
2007-11-09 13:43:09 +01:00
|
|
|
CHECK_SPACE(pos, end, 6);
|
2005-02-03 16:22:16 +01:00
|
|
|
charset_inited= 1;
|
|
|
|
memcpy(charset, pos, 6);
|
|
|
|
pos+= 6;
|
|
|
|
break;
|
|
|
|
}
|
2005-03-22 00:26:12 +01:00
|
|
|
case Q_TIME_ZONE_CODE:
|
|
|
|
{
|
2007-11-09 13:43:09 +01:00
|
|
|
if (get_str_len_and_pointer(&pos, &time_zone_str, &time_zone_len, end))
|
|
|
|
{
|
2007-11-12 22:02:12 +01:00
|
|
|
DBUG_PRINT("info", ("Q_TIME_ZONE_CODE: query= 0"));
|
2007-11-09 13:43:09 +01:00
|
|
|
query= 0;
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
2005-03-22 00:26:12 +01:00
|
|
|
break;
|
|
|
|
}
|
2005-03-29 17:26:38 +02:00
|
|
|
case Q_CATALOG_CODE: /* for 5.0.x where 0<=x<=3 masters */
|
2007-11-09 13:43:09 +01:00
|
|
|
CHECK_SPACE(pos, end, 1);
|
2005-03-29 17:26:38 +02:00
|
|
|
if ((catalog_len= *pos))
|
|
|
|
catalog= (char*) pos+1; // Will be copied later
|
2007-11-09 13:43:09 +01:00
|
|
|
CHECK_SPACE(pos, end, catalog_len + 2);
|
2005-03-29 17:26:38 +02:00
|
|
|
pos+= catalog_len+2; // leap over end 0
|
|
|
|
catalog_nz= 0; // catalog has end 0 in event
|
|
|
|
break;
|
2006-12-07 06:31:53 +01:00
|
|
|
case Q_LC_TIME_NAMES_CODE:
|
2007-11-09 13:43:09 +01:00
|
|
|
CHECK_SPACE(pos, end, 2);
|
2006-12-07 06:31:53 +01:00
|
|
|
lc_time_names_number= uint2korr(pos);
|
|
|
|
pos+= 2;
|
|
|
|
break;
|
2007-02-28 14:06:57 +01:00
|
|
|
case Q_CHARSET_DATABASE_CODE:
|
2007-11-09 13:43:09 +01:00
|
|
|
CHECK_SPACE(pos, end, 2);
|
2007-02-28 14:06:57 +01:00
|
|
|
charset_database_number= uint2korr(pos);
|
|
|
|
pos+= 2;
|
|
|
|
break;
|
2008-08-26 12:01:49 +02:00
|
|
|
case Q_TABLE_MAP_FOR_UPDATE_CODE:
|
|
|
|
CHECK_SPACE(pos, end, 8);
|
|
|
|
table_map_for_update= uint8korr(pos);
|
|
|
|
pos+= 8;
|
|
|
|
break;
|
2004-11-12 04:01:46 +01:00
|
|
|
default:
|
|
|
|
/* That's why you must write status vars in growing order of code */
|
|
|
|
DBUG_PRINT("info",("Query_log_event has unknown status vars (first has\
|
|
|
|
code: %u), skipping the rest of them", (uint) *(pos-1)));
|
2005-03-29 17:26:38 +02:00
|
|
|
pos= (const uchar*) end; // Break loop
|
2004-11-12 04:01:46 +01:00
|
|
|
}
|
2001-11-18 01:23:46 +01:00
|
|
|
}
|
2004-11-12 04:01:46 +01:00
|
|
|
|
2005-08-24 11:14:41 +02:00
|
|
|
#if !defined(MYSQL_CLIENT) && defined(HAVE_QUERY_CACHE)
|
2007-01-10 18:20:13 +01:00
|
|
|
if (!(start= data_buf = (Log_event::Byte*) my_malloc(catalog_len + 1 +
|
|
|
|
time_zone_len + 1 +
|
|
|
|
data_len + 1 +
|
|
|
|
QUERY_CACHE_FLAGS_SIZE +
|
|
|
|
db_len + 1,
|
|
|
|
MYF(MY_WME))))
|
2005-08-24 11:14:41 +02:00
|
|
|
#else
|
2007-01-10 18:20:13 +01:00
|
|
|
if (!(start= data_buf = (Log_event::Byte*) my_malloc(catalog_len + 1 +
|
|
|
|
time_zone_len + 1 +
|
|
|
|
data_len + 1,
|
|
|
|
MYF(MY_WME))))
|
2005-08-19 16:25:55 +02:00
|
|
|
#endif
|
2005-08-24 01:45:15 +02:00
|
|
|
DBUG_VOID_RETURN;
|
2005-03-22 00:26:12 +01:00
|
|
|
if (catalog_len) // If catalog is given
|
2004-11-12 04:01:46 +01:00
|
|
|
{
|
2007-10-25 11:58:18 +02:00
|
|
|
/**
|
|
|
|
@todo we should clean up and do only copy_str_and_move; it
|
|
|
|
works for both cases. Then we can remove the catalog_nz
|
|
|
|
flag. /sven
|
|
|
|
*/
|
2005-03-29 17:26:38 +02:00
|
|
|
if (likely(catalog_nz)) // true except if event comes from 5.0.0|1|2|3.
|
2007-01-10 18:20:13 +01:00
|
|
|
copy_str_and_move(&catalog, &start, catalog_len);
|
2005-03-29 17:26:38 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
memcpy(start, catalog, catalog_len+1); // copy end 0
|
2007-01-10 18:20:13 +01:00
|
|
|
catalog= (const char *)start;
|
2005-03-29 17:26:38 +02:00
|
|
|
start+= catalog_len+1;
|
|
|
|
}
|
2004-11-12 04:01:46 +01:00
|
|
|
}
|
2005-03-22 00:26:12 +01:00
|
|
|
if (time_zone_len)
|
2007-01-10 18:20:13 +01:00
|
|
|
copy_str_and_move(&time_zone_str, &start, time_zone_len);
|
2005-05-05 14:20:53 +02:00
|
|
|
|
2007-10-25 11:58:18 +02:00
|
|
|
/**
|
|
|
|
if time_zone_len or catalog_len are 0, then time_zone and catalog
|
|
|
|
are uninitialized at this point. shouldn't they point to the
|
|
|
|
zero-length null-terminated strings we allocated space for in the
|
|
|
|
my_alloc call above? /sven
|
|
|
|
*/
|
|
|
|
|
2005-03-22 00:26:12 +01:00
|
|
|
/* A 2nd variable part; this is common to all versions */
|
2004-11-12 04:01:46 +01:00
|
|
|
memcpy((char*) start, end, data_len); // Copy db and query
|
2005-03-22 00:26:12 +01:00
|
|
|
start[data_len]= '\0'; // End query with \0 (For safetly)
|
2007-01-10 18:20:13 +01:00
|
|
|
db= (char *)start;
|
|
|
|
query= (char *)(start + db_len + 1);
|
2004-11-12 04:01:46 +01:00
|
|
|
q_len= data_len - db_len -1;
|
|
|
|
DBUG_VOID_RETURN;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
#ifdef MYSQL_CLIENT
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
Query_log_event::print().
|
|
|
|
|
|
|
|
@todo
|
|
|
|
print the catalog ??
|
|
|
|
*/
|
2006-10-06 10:17:02 +02:00
|
|
|
void Query_log_event::print_query_header(IO_CACHE* file,
|
2005-10-19 19:31:24 +02:00
|
|
|
PRINT_EVENT_INFO* print_event_info)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
// TODO: print the catalog ??
|
2001-02-15 02:43:14 +01:00
|
|
|
char buff[40],*end; // Enough for SET TIMESTAMP
|
2004-11-12 04:01:46 +01:00
|
|
|
bool different_db= 1;
|
|
|
|
uint32 tmp;
|
|
|
|
|
2005-10-19 19:31:24 +02:00
|
|
|
if (!print_event_info->short_form)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
print_header(file, print_event_info, FALSE);
|
|
|
|
my_b_printf(file, "\t%s\tthread_id=%lu\texec_time=%lu\terror_code=%d\n",
|
|
|
|
get_type_str(), (ulong) thread_id, (ulong) exec_time,
|
|
|
|
error_code);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
2004-12-06 10:38:56 +01:00
|
|
|
if (!(flags & LOG_EVENT_SUPPRESS_USE_F) && db)
|
2002-06-11 10:20:31 +02:00
|
|
|
{
|
2008-12-16 13:12:22 +01:00
|
|
|
if ((different_db= memcmp(print_event_info->db, db, db_len + 1)))
|
2005-10-19 19:31:24 +02:00
|
|
|
memcpy(print_event_info->db, db, db_len + 1);
|
2004-12-06 10:38:56 +01:00
|
|
|
if (db[0] && different_db)
|
2006-12-08 07:33:05 +01:00
|
|
|
my_b_printf(file, "use %s%s\n", db, print_event_info->delimiter);
|
2002-06-11 10:20:31 +02:00
|
|
|
}
|
2004-12-03 12:13:51 +01:00
|
|
|
|
2001-02-15 02:43:14 +01:00
|
|
|
end=int10_to_str((long) when, strmov(buff,"SET TIMESTAMP="),10);
|
2006-11-28 13:26:15 +01:00
|
|
|
end= strmov(end, print_event_info->delimiter);
|
2001-02-15 02:43:14 +01:00
|
|
|
*end++='\n';
|
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_b_write(file, (uchar*) buff, (uint) (end-buff));
|
2008-03-07 13:59:36 +01:00
|
|
|
if ((!print_event_info->thread_id_printed ||
|
|
|
|
((flags & LOG_EVENT_THREAD_SPECIFIC_F) &&
|
|
|
|
thread_id != print_event_info->thread_id)))
|
|
|
|
{
|
|
|
|
// If --short-form, print deterministic value instead of pseudo_thread_id.
|
2006-12-08 07:33:05 +01:00
|
|
|
my_b_printf(file,"SET @@session.pseudo_thread_id=%lu%s\n",
|
2008-03-07 13:59:36 +01:00
|
|
|
short_form ? 999999999 : (ulong)thread_id,
|
|
|
|
print_event_info->delimiter);
|
|
|
|
print_event_info->thread_id= thread_id;
|
|
|
|
print_event_info->thread_id_printed= 1;
|
|
|
|
}
|
2005-02-09 20:04:28 +01:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
/*
|
2005-02-09 20:04:28 +01:00
|
|
|
If flags2_inited==0, this is an event from 3.23 or 4.0; nothing to
|
|
|
|
print (remember we don't produce mixed relay logs so there cannot be
|
|
|
|
5.0 events before that one so there is nothing to reset).
|
2004-11-12 04:01:46 +01:00
|
|
|
*/
|
|
|
|
if (likely(flags2_inited)) /* likely as this will mainly read 5.0 logs */
|
|
|
|
{
|
|
|
|
/* tmp is a bitmask of bits which have changed. */
|
2005-10-19 19:31:24 +02:00
|
|
|
if (likely(print_event_info->flags2_inited))
|
2004-11-12 04:01:46 +01:00
|
|
|
/* All bits which have changed */
|
2005-10-19 19:31:24 +02:00
|
|
|
tmp= (print_event_info->flags2) ^ flags2;
|
2004-11-12 04:01:46 +01:00
|
|
|
else /* that's the first Query event we read */
|
|
|
|
{
|
2005-10-19 19:31:24 +02:00
|
|
|
print_event_info->flags2_inited= 1;
|
2004-11-12 04:01:46 +01:00
|
|
|
tmp= ~((uint32)0); /* all bits have changed */
|
|
|
|
}
|
|
|
|
|
|
|
|
if (unlikely(tmp)) /* some bits have changed */
|
|
|
|
{
|
|
|
|
bool need_comma= 0;
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(file, "SET ");
|
2004-11-12 04:01:46 +01:00
|
|
|
print_set_option(file, tmp, OPTION_NO_FOREIGN_KEY_CHECKS, ~flags2,
|
2008-04-02 11:49:22 +02:00
|
|
|
"@@session.foreign_key_checks", &need_comma);
|
2004-11-12 04:01:46 +01:00
|
|
|
print_set_option(file, tmp, OPTION_AUTO_IS_NULL, flags2,
|
2008-04-02 11:49:22 +02:00
|
|
|
"@@session.sql_auto_is_null", &need_comma);
|
2004-11-12 04:01:46 +01:00
|
|
|
print_set_option(file, tmp, OPTION_RELAXED_UNIQUE_CHECKS, ~flags2,
|
2008-04-02 11:49:22 +02:00
|
|
|
"@@session.unique_checks", &need_comma);
|
|
|
|
print_set_option(file, tmp, OPTION_NOT_AUTOCOMMIT, ~flags2,
|
|
|
|
"@@session.autocommit", &need_comma);
|
2006-12-08 07:33:05 +01:00
|
|
|
my_b_printf(file,"%s\n", print_event_info->delimiter);
|
2005-10-19 19:31:24 +02:00
|
|
|
print_event_info->flags2= flags2;
|
2004-11-12 04:01:46 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2005-02-09 20:04:28 +01:00
|
|
|
Now the session variables;
|
|
|
|
it's more efficient to pass SQL_MODE as a number instead of a
|
|
|
|
comma-separated list.
|
|
|
|
FOREIGN_KEY_CHECKS, SQL_AUTO_IS_NULL, UNIQUE_CHECKS are session-only
|
|
|
|
variables (they have no global version; they're not listed in
|
|
|
|
sql_class.h), The tests below work for pure binlogs or pure relay
|
|
|
|
logs. Won't work for mixed relay logs but we don't create mixed
|
|
|
|
relay logs (that is, there is no relay log with a format change
|
|
|
|
except within the 3 first events, which mysqlbinlog handles
|
|
|
|
gracefully). So this code should always be good.
|
2004-11-12 04:01:46 +01:00
|
|
|
*/
|
|
|
|
|
2008-03-07 13:59:36 +01:00
|
|
|
if (likely(sql_mode_inited) &&
|
|
|
|
(unlikely(print_event_info->sql_mode != sql_mode ||
|
|
|
|
!print_event_info->sql_mode_inited)))
|
2004-11-12 04:01:46 +01:00
|
|
|
{
|
2008-03-07 13:59:36 +01:00
|
|
|
my_b_printf(file,"SET @@session.sql_mode=%lu%s\n",
|
|
|
|
(ulong)sql_mode, print_event_info->delimiter);
|
|
|
|
print_event_info->sql_mode= sql_mode;
|
|
|
|
print_event_info->sql_mode_inited= 1;
|
2004-11-12 04:01:46 +01:00
|
|
|
}
|
2005-10-19 19:31:24 +02:00
|
|
|
if (print_event_info->auto_increment_increment != auto_increment_increment ||
|
|
|
|
print_event_info->auto_increment_offset != auto_increment_offset)
|
2004-11-12 04:01:46 +01:00
|
|
|
{
|
2006-12-08 07:33:05 +01:00
|
|
|
my_b_printf(file,"SET @@session.auto_increment_increment=%lu, @@session.auto_increment_offset=%lu%s\n",
|
|
|
|
auto_increment_increment,auto_increment_offset,
|
|
|
|
print_event_info->delimiter);
|
2005-10-19 19:31:24 +02:00
|
|
|
print_event_info->auto_increment_increment= auto_increment_increment;
|
|
|
|
print_event_info->auto_increment_offset= auto_increment_offset;
|
2004-11-12 04:01:46 +01:00
|
|
|
}
|
|
|
|
|
2005-03-22 00:26:12 +01:00
|
|
|
/* TODO: print the catalog when we feature SET CATALOG */
|
|
|
|
|
2008-03-07 13:59:36 +01:00
|
|
|
if (likely(charset_inited) &&
|
|
|
|
(unlikely(!print_event_info->charset_inited ||
|
|
|
|
bcmp((uchar*) print_event_info->charset, (uchar*) charset, 6))))
|
2005-02-03 16:22:16 +01:00
|
|
|
{
|
2008-03-07 13:59:36 +01:00
|
|
|
CHARSET_INFO *cs_info= get_charset(uint2korr(charset), MYF(MY_WME));
|
|
|
|
if (cs_info)
|
2005-02-03 16:22:16 +01:00
|
|
|
{
|
2008-03-07 13:59:36 +01:00
|
|
|
/* for mysql client */
|
|
|
|
my_b_printf(file, "/*!\\C %s */%s\n",
|
|
|
|
cs_info->csname, print_event_info->delimiter);
|
2005-02-03 16:22:16 +01:00
|
|
|
}
|
2008-03-07 13:59:36 +01:00
|
|
|
my_b_printf(file,"SET "
|
|
|
|
"@@session.character_set_client=%d,"
|
|
|
|
"@@session.collation_connection=%d,"
|
|
|
|
"@@session.collation_server=%d"
|
|
|
|
"%s\n",
|
|
|
|
uint2korr(charset),
|
|
|
|
uint2korr(charset+2),
|
|
|
|
uint2korr(charset+4),
|
|
|
|
print_event_info->delimiter);
|
|
|
|
memcpy(print_event_info->charset, charset, 6);
|
|
|
|
print_event_info->charset_inited= 1;
|
2005-02-03 16:22:16 +01:00
|
|
|
}
|
2005-03-22 00:26:12 +01:00
|
|
|
if (time_zone_len)
|
|
|
|
{
|
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 (bcmp((uchar*) print_event_info->time_zone_str,
|
|
|
|
(uchar*) time_zone_str, time_zone_len+1))
|
2005-03-22 00:26:12 +01:00
|
|
|
{
|
2006-12-08 07:33:05 +01:00
|
|
|
my_b_printf(file,"SET @@session.time_zone='%s'%s\n",
|
|
|
|
time_zone_str, print_event_info->delimiter);
|
2005-10-19 19:31:24 +02:00
|
|
|
memcpy(print_event_info->time_zone_str, time_zone_str, time_zone_len+1);
|
2005-03-22 00:26:12 +01:00
|
|
|
}
|
|
|
|
}
|
2006-12-07 06:31:53 +01:00
|
|
|
if (lc_time_names_number != print_event_info->lc_time_names_number)
|
|
|
|
{
|
2006-12-29 13:45:10 +01:00
|
|
|
my_b_printf(file, "SET @@session.lc_time_names=%d%s\n",
|
|
|
|
lc_time_names_number, print_event_info->delimiter);
|
2006-12-07 06:31:53 +01:00
|
|
|
print_event_info->lc_time_names_number= lc_time_names_number;
|
|
|
|
}
|
2007-02-28 14:06:57 +01:00
|
|
|
if (charset_database_number != print_event_info->charset_database_number)
|
|
|
|
{
|
|
|
|
if (charset_database_number)
|
2007-03-01 15:16:17 +01:00
|
|
|
my_b_printf(file, "SET @@session.collation_database=%d%s\n",
|
|
|
|
charset_database_number, print_event_info->delimiter);
|
2007-02-28 14:06:57 +01:00
|
|
|
else
|
2007-03-01 15:16:17 +01:00
|
|
|
my_b_printf(file, "SET @@session.collation_database=DEFAULT%s\n",
|
|
|
|
print_event_info->delimiter);
|
2007-02-28 14:06:57 +01:00
|
|
|
print_event_info->charset_database_number= charset_database_number;
|
|
|
|
}
|
2005-03-16 02:32:47 +01:00
|
|
|
}
|
|
|
|
|
2005-02-03 16:22:16 +01:00
|
|
|
|
2005-10-19 19:31:24 +02:00
|
|
|
void Query_log_event::print(FILE* file, PRINT_EVENT_INFO* print_event_info)
|
2005-03-16 02:32:47 +01:00
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
Write_on_release_cache cache(&print_event_info->head_cache, file);
|
|
|
|
|
|
|
|
print_query_header(&cache, print_event_info);
|
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_b_write(&cache, (uchar*) query, q_len);
|
2007-12-17 14:13:25 +01:00
|
|
|
my_b_printf(&cache, "\n%s\n", print_event_info->delimiter);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2003-05-19 15:35:49 +02:00
|
|
|
#endif /* MYSQL_CLIENT */
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2006-11-10 15:10:41 +01:00
|
|
|
Query_log_event::do_apply_event()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2006-06-28 21:47:45 +02:00
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
int Query_log_event::do_apply_event(Relay_log_info const *rli)
|
2005-03-16 02:32:47 +01:00
|
|
|
{
|
2006-11-10 15:10:41 +01:00
|
|
|
return do_apply_event(rli, query, q_len);
|
2005-03-16 02:32:47 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
@todo
|
|
|
|
Compare the values of "affected rows" around here. Something
|
|
|
|
like:
|
|
|
|
@code
|
|
|
|
if ((uint32) affected_in_event != (uint32) affected_on_slave)
|
|
|
|
{
|
|
|
|
sql_print_error("Slave: did not get the expected number of affected \
|
|
|
|
rows running query from master - expected %d, got %d (this numbers \
|
|
|
|
should have matched modulo 4294967296).", 0, ...);
|
|
|
|
thd->query_error = 1;
|
|
|
|
}
|
|
|
|
@endcode
|
|
|
|
We may also want an option to tell the slave to ignore "affected"
|
|
|
|
mismatch. This mismatch could be implemented with a new ER_ code, and
|
|
|
|
to ignore it you would use --slave-skip-errors...
|
|
|
|
*/
|
2007-08-16 07:37:50 +02:00
|
|
|
int Query_log_event::do_apply_event(Relay_log_info const *rli,
|
2006-11-01 15:35:37 +01:00
|
|
|
const char *query_arg, uint32 q_len_arg)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2006-07-13 09:43:52 +02:00
|
|
|
LEX_STRING new_db;
|
2003-08-11 21:44:43 +02:00
|
|
|
int expected_error,actual_error= 0;
|
2004-11-12 04:01:46 +01:00
|
|
|
/*
|
2006-11-01 15:35:37 +01:00
|
|
|
Colleagues: please never free(thd->catalog) in MySQL. This would
|
|
|
|
lead to bugs as here thd->catalog is a part of an alloced block,
|
|
|
|
not an entire alloced block (see
|
2006-11-10 15:10:41 +01:00
|
|
|
Query_log_event::do_apply_event()). Same for thd->db. Thank
|
2006-11-01 15:35:37 +01:00
|
|
|
you.
|
2004-11-12 04:01:46 +01:00
|
|
|
*/
|
2005-03-22 00:26:12 +01:00
|
|
|
thd->catalog= catalog_len ? (char *) catalog : (char *)"";
|
2006-07-13 09:43:52 +02:00
|
|
|
new_db.length= db_len;
|
|
|
|
new_db.str= (char *) rpl_filter->get_rewrite_db(db, &new_db.length);
|
|
|
|
thd->set_db(new_db.str, new_db.length); /* allocates a copy of 'db' */
|
2004-11-12 04:01:46 +01:00
|
|
|
thd->variables.auto_increment_increment= auto_increment_increment;
|
|
|
|
thd->variables.auto_increment_offset= auto_increment_offset;
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
/*
|
2004-11-12 04:01:46 +01:00
|
|
|
InnoDB internally stores the master log position it has executed so far,
|
|
|
|
i.e. the position just after the COMMIT event.
|
|
|
|
When InnoDB will want to store, the positions in rli won't have
|
|
|
|
been updated yet, so group_master_log_* will point to old BEGIN
|
|
|
|
and event_master_log* will point to the beginning of current COMMIT.
|
|
|
|
But log_pos of the COMMIT Query event is what we want, i.e. the pos of the
|
|
|
|
END of the current log event (COMMIT). We save it in rli so that InnoDB can
|
|
|
|
access it.
|
2002-10-30 07:50:07 +01:00
|
|
|
*/
|
2007-08-16 07:37:50 +02:00
|
|
|
const_cast<Relay_log_info*>(rli)->future_group_master_log_pos= log_pos;
|
2004-11-12 04:01:46 +01:00
|
|
|
DBUG_PRINT("info", ("log_pos: %lu", (ulong) log_pos));
|
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
clear_all_errors(thd, const_cast<Relay_log_info*>(rli));
|
2009-02-04 11:13:54 +01:00
|
|
|
if (strcmp("COMMIT", query) == 0 && rli->tables_to_lock)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Cleaning-up the last statement context:
|
|
|
|
the terminal event of the current statement flagged with
|
|
|
|
STMT_END_F got filtered out in ndb circular replication.
|
|
|
|
*/
|
|
|
|
int error;
|
|
|
|
char llbuff[22];
|
|
|
|
if ((error= rows_event_stmt_cleanup(const_cast<Relay_log_info*>(rli), thd)))
|
|
|
|
{
|
|
|
|
const_cast<Relay_log_info*>(rli)->report(ERROR_LEVEL, error,
|
|
|
|
"Error in cleaning up after an event preceeding the commit; "
|
|
|
|
"the group log file/position: %s %s",
|
|
|
|
const_cast<Relay_log_info*>(rli)->group_master_log_name,
|
|
|
|
llstr(const_cast<Relay_log_info*>(rli)->group_master_log_pos,
|
|
|
|
llbuff));
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
Executing a part of rli->stmt_done() logics that does not deal
|
|
|
|
with group position change. The part is redundant now but is
|
|
|
|
future-change-proof addon, e.g if COMMIT handling will start checking
|
|
|
|
invariants like IN_STMT flag must be off at committing the transaction.
|
|
|
|
*/
|
|
|
|
const_cast<Relay_log_info*>(rli)->inc_event_relay_log_pos();
|
|
|
|
const_cast<Relay_log_info*>(rli)->clear_flag(Relay_log_info::IN_STMT);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
const_cast<Relay_log_info*>(rli)->clear_tables_to_lock();
|
|
|
|
}
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2005-09-01 17:58:00 +02:00
|
|
|
/*
|
|
|
|
Note: We do not need to execute reset_one_shot_variables() if this
|
|
|
|
db_ok() test fails.
|
|
|
|
Reason: The db stored in binlog events is the same for SET and for
|
|
|
|
its companion query. If the SET is ignored because of
|
|
|
|
db_ok(), the companion query will also be ignored, and if
|
|
|
|
the companion query is ignored in the db_ok() test of
|
2006-11-10 15:10:41 +01:00
|
|
|
::do_apply_event(), then the companion SET also have so
|
2006-11-01 15:35:37 +01:00
|
|
|
we don't need to reset_one_shot_variables().
|
2005-09-01 17:58:00 +02:00
|
|
|
*/
|
2005-03-08 21:12:35 +01:00
|
|
|
if (rpl_filter->db_ok(thd->db))
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
|
|
|
thd->set_time((time_t)when);
|
2005-03-16 02:32:47 +01:00
|
|
|
thd->query_length= q_len_arg;
|
|
|
|
thd->query= (char*)query_arg;
|
2003-11-04 08:40:36 +01:00
|
|
|
VOID(pthread_mutex_lock(&LOCK_thread_count));
|
2005-01-16 13:16:23 +01:00
|
|
|
thd->query_id = next_query_id();
|
2002-10-30 07:50:07 +01:00
|
|
|
VOID(pthread_mutex_unlock(&LOCK_thread_count));
|
2002-12-29 22:46:48 +01:00
|
|
|
thd->variables.pseudo_thread_id= thread_id; // for temp tables
|
2004-03-16 21:41:30 +01:00
|
|
|
DBUG_PRINT("query",("%s",thd->query));
|
2005-02-21 16:28:05 +01:00
|
|
|
|
2004-03-16 21:41:30 +01:00
|
|
|
if (ignored_error_code((expected_error= error_code)) ||
|
2002-10-30 07:50:07 +01:00
|
|
|
!check_expected_error(thd,rli,expected_error))
|
2005-02-03 16:22:16 +01:00
|
|
|
{
|
|
|
|
if (flags2_inited)
|
|
|
|
/*
|
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
|
|
|
all bits of thd->options which are 1 in OPTIONS_WRITTEN_TO_BIN_LOG
|
|
|
|
must take their value from flags2.
|
2005-02-03 16:22:16 +01:00
|
|
|
*/
|
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
|
|
|
thd->options= flags2|(thd->options & ~OPTIONS_WRITTEN_TO_BIN_LOG);
|
2005-02-03 16:22:16 +01:00
|
|
|
/*
|
|
|
|
else, we are in a 3.23/4.0 binlog; we previously received a
|
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
|
|
|
Rotate_log_event which reset thd->options and sql_mode etc, so
|
|
|
|
nothing to do.
|
2005-02-03 16:22:16 +01:00
|
|
|
*/
|
|
|
|
/*
|
|
|
|
We do not replicate IGNORE_DIR_IN_CREATE. That is, if the master is a
|
|
|
|
slave which runs with SQL_MODE=IGNORE_DIR_IN_CREATE, this should not
|
|
|
|
force us to ignore the dir too. Imagine you are a ring of machines, and
|
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
|
|
|
one has a disk problem so that you temporarily need
|
|
|
|
IGNORE_DIR_IN_CREATE on this machine; you don't want it to propagate
|
|
|
|
elsewhere (you don't want all slaves to start ignoring the dirs).
|
2005-02-03 16:22:16 +01:00
|
|
|
*/
|
|
|
|
if (sql_mode_inited)
|
|
|
|
thd->variables.sql_mode=
|
|
|
|
(ulong) ((thd->variables.sql_mode & MODE_NO_DIR_IN_CREATE) |
|
|
|
|
(sql_mode & ~(ulong) MODE_NO_DIR_IN_CREATE));
|
|
|
|
if (charset_inited)
|
|
|
|
{
|
|
|
|
if (rli->cached_charset_compare(charset))
|
|
|
|
{
|
|
|
|
/* Verify that we support the charsets found in the event. */
|
|
|
|
if (!(thd->variables.character_set_client=
|
|
|
|
get_charset(uint2korr(charset), MYF(MY_WME))) ||
|
|
|
|
!(thd->variables.collation_connection=
|
|
|
|
get_charset(uint2korr(charset+2), MYF(MY_WME))) ||
|
|
|
|
!(thd->variables.collation_server=
|
|
|
|
get_charset(uint2korr(charset+4), MYF(MY_WME))))
|
|
|
|
{
|
|
|
|
/*
|
2005-03-22 00:26:12 +01:00
|
|
|
We updated the thd->variables with nonsensical values (0). Let's
|
|
|
|
set them to something safe (i.e. which avoids crash), and we'll
|
|
|
|
stop with EE_UNKNOWN_CHARSET in compare_errors (unless set to
|
|
|
|
ignore this error).
|
2005-02-03 16:22:16 +01:00
|
|
|
*/
|
2005-03-22 00:26:12 +01:00
|
|
|
set_slave_thread_default_charset(thd, rli);
|
2005-02-03 16:22:16 +01:00
|
|
|
goto compare_errors;
|
|
|
|
}
|
|
|
|
thd->update_charset(); // for the charset change to take effect
|
|
|
|
}
|
|
|
|
}
|
2005-03-22 00:26:12 +01:00
|
|
|
if (time_zone_len)
|
|
|
|
{
|
|
|
|
String tmp(time_zone_str, time_zone_len, &my_charset_bin);
|
BUG#9953: CONVERT_TZ requires mysql.time_zone_name to be locked
The problem was that some facilities (like CONVERT_TZ() function or
server HELP statement) may require implicit access to some tables in
'mysql' database. This access was done by ordinary means of adding
such tables to the list of tables the query is going to open.
However, if we issued LOCK TABLES before that, we would get "table
was not locked" error trying to open such implicit tables.
The solution is to treat certain tables as MySQL system tables, like
we already do for mysql.proc. Such tables may be opened for reading
at any moment regardless of any locks in effect. The cost of this is
that system table may be locked for writing only together with other
system tables, it is disallowed to lock system tables for writing and
have any other lock on any other table.
After this patch the following tables are treated as MySQL system
tables:
mysql.help_category
mysql.help_keyword
mysql.help_relation
mysql.help_topic
mysql.proc (it already was)
mysql.time_zone
mysql.time_zone_leap_second
mysql.time_zone_name
mysql.time_zone_transition
mysql.time_zone_transition_type
These tables are now opened with open_system_tables_for_read() and
closed with close_system_tables(), or one table may be opened with
open_system_table_for_update() and closed with close_thread_tables()
(the latter is used for mysql.proc table, which is updated as part of
normal MySQL server operation). These functions may be used when
some tables were opened and locked already.
NOTE: online update of time zone tables is not possible during
replication, because there's no time zone cache flush neither on LOCK
TABLES, nor on FLUSH TABLES, so the master may serve stale time zone
data from cache, while on slave updated data will be loaded from the
time zone tables.
2007-03-09 11:12:31 +01:00
|
|
|
if (!(thd->variables.time_zone= my_tz_find(thd, &tmp)))
|
2005-03-22 00:26:12 +01:00
|
|
|
{
|
|
|
|
my_error(ER_UNKNOWN_TIME_ZONE, MYF(0), tmp.c_ptr());
|
|
|
|
thd->variables.time_zone= global_system_variables.time_zone;
|
|
|
|
goto compare_errors;
|
|
|
|
}
|
|
|
|
}
|
2006-12-07 06:31:53 +01:00
|
|
|
if (lc_time_names_number)
|
|
|
|
{
|
|
|
|
if (!(thd->variables.lc_time_names=
|
|
|
|
my_locale_by_number(lc_time_names_number)))
|
|
|
|
{
|
|
|
|
my_printf_error(ER_UNKNOWN_ERROR,
|
|
|
|
"Unknown locale: '%d'", MYF(0), lc_time_names_number);
|
|
|
|
thd->variables.lc_time_names= &my_locale_en_US;
|
|
|
|
goto compare_errors;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
thd->variables.lc_time_names= &my_locale_en_US;
|
2007-02-28 14:06:57 +01:00
|
|
|
if (charset_database_number)
|
|
|
|
{
|
|
|
|
CHARSET_INFO *cs;
|
|
|
|
if (!(cs= get_charset(charset_database_number, MYF(0))))
|
|
|
|
{
|
|
|
|
char buf[20];
|
|
|
|
int10_to_str((int) charset_database_number, buf, -10);
|
|
|
|
my_error(ER_UNKNOWN_COLLATION, MYF(0), buf);
|
|
|
|
goto compare_errors;
|
|
|
|
}
|
|
|
|
thd->variables.collation_database= cs;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
thd->variables.collation_database= thd->db_charset;
|
|
|
|
|
2008-08-26 12:01:49 +02:00
|
|
|
thd->table_map_for_update= (table_map)table_map_for_update;
|
|
|
|
|
2005-02-03 16:22:16 +01:00
|
|
|
/* Execute the query (note that we bypass dispatch_command()) */
|
Bug#25411 (trigger code truncated), PART I
The issue found with bug 25411 is due to the function skip_rear_comments()
which damages the source code while implementing a work around.
The root cause of the problem is in the lexical analyser, which does not
process special comments properly.
For special comments like :
[1] aaa /*!50000 bbb */ ccc
since 5.0 is a version older that the current code, the parser is in lining
the content of the special comment, so that the query to process is
[2] aaa bbb ccc
However, the text of the query captured when processing a stored procedure,
stored function or trigger (or event in 5.1), can be after rebuilding it:
[3] aaa bbb */ ccc
which is wrong.
To fix bug 25411 properly, the lexical analyser needs to return [2] when
in lining special comments.
In order to implement this, some preliminary cleanup is required in the code,
which is implemented by this patch.
Before this change, the structure named LEX (or st_lex) contains attributes
that belong to lexical analysis, as well as attributes that represents the
abstract syntax tree (AST) of a statement.
Creating a new LEX structure for each statements (which makes sense for the
AST part) also re-initialized the lexical analysis phase each time, which
is conceptually wrong.
With this patch, the previous st_lex structure has been split in two:
- st_lex represents the Abstract Syntax Tree for a statement. The name "lex"
has not been changed to avoid a bigger impact in the code base.
- class lex_input_stream represents the internal state of the lexical
analyser, which by definition should *not* be reinitialized when parsing
multiple statements from the same input stream.
This change is a pre-requisite for bug 25411, since the implementation of
lex_input_stream will later improve to deal properly with special comments,
and this processing can not be done with the current implementation of
sp_head::reset_lex and sp_head::restore_lex, which interfere with the lexer.
This change set alone does not fix bug 25411.
2007-04-24 17:24:21 +02:00
|
|
|
const char* found_semicolon= NULL;
|
|
|
|
mysql_parse(thd, thd->query, thd->query_length, &found_semicolon);
|
2007-07-30 10:33:50 +02:00
|
|
|
log_slow_statement(thd);
|
2005-02-03 16:22:16 +01:00
|
|
|
}
|
2004-03-16 21:41:30 +01:00
|
|
|
else
|
|
|
|
{
|
2003-08-11 21:44:43 +02:00
|
|
|
/*
|
2004-03-16 21:41:30 +01:00
|
|
|
The query got a really bad error on the master (thread killed etc),
|
|
|
|
which could be inconsistent. Parse it to test the table names: if the
|
|
|
|
replicate-*-do|ignore-table rules say "this query must be ignored" then
|
|
|
|
we exit gracefully; otherwise we warn about the bad error and tell DBA
|
|
|
|
to check/fix it.
|
2003-08-11 21:44:43 +02:00
|
|
|
*/
|
2005-03-16 02:32:47 +01:00
|
|
|
if (mysql_test_parse_for_slave(thd, thd->query, thd->query_length))
|
2007-08-16 07:37:50 +02:00
|
|
|
clear_all_errors(thd, const_cast<Relay_log_info*>(rli)); /* Can ignore query */
|
2004-03-16 21:41:30 +01:00
|
|
|
else
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
2007-06-09 07:19:37 +02:00
|
|
|
rli->report(ERROR_LEVEL, expected_error,
|
2003-08-11 21:44:43 +02:00
|
|
|
"\
|
2004-05-05 16:05:24 +02:00
|
|
|
Query partially completed on the master (error on master: %d) \
|
2004-03-16 21:41:30 +01:00
|
|
|
and was aborted. There is a chance that your master is inconsistent at this \
|
|
|
|
point. If you are sure that your master is ok, run this query manually on the \
|
|
|
|
slave and then restart the slave with SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1; \
|
2004-05-05 16:05:24 +02:00
|
|
|
START SLAVE; . Query: '%s'", expected_error, thd->query);
|
2007-10-19 23:20:38 +02:00
|
|
|
thd->is_slave_error= 1;
|
2004-03-16 21:41:30 +01:00
|
|
|
}
|
|
|
|
goto end;
|
|
|
|
}
|
2005-02-03 16:22:16 +01:00
|
|
|
|
2005-02-17 00:28:04 +01:00
|
|
|
/* If the query was not ignored, it is printed to the general log */
|
2007-12-12 16:21:01 +01:00
|
|
|
if (!thd->is_error() || thd->main_da.sql_errno() != ER_SLAVE_IGNORED_TABLE)
|
2007-10-18 20:45:07 +02:00
|
|
|
general_log_write(thd, COM_QUERY, thd->query, thd->query_length);
|
2005-02-17 00:28:04 +01:00
|
|
|
|
2005-02-03 16:22:16 +01:00
|
|
|
compare_errors:
|
2005-02-22 22:40:34 +01:00
|
|
|
|
|
|
|
/*
|
2004-03-16 21:41:30 +01:00
|
|
|
If we expected a non-zero error code, and we don't get the same error
|
|
|
|
code, and none of them should be ignored.
|
|
|
|
*/
|
2007-12-12 16:21:01 +01:00
|
|
|
actual_error= thd->is_error() ? thd->main_da.sql_errno() : 0;
|
|
|
|
DBUG_PRINT("info",("expected_error: %d sql_errno: %d",
|
|
|
|
expected_error, actual_error));
|
|
|
|
if ((expected_error != actual_error) &&
|
2004-11-12 04:01:46 +01:00
|
|
|
expected_error &&
|
|
|
|
!ignored_error_code(actual_error) &&
|
|
|
|
!ignored_error_code(expected_error))
|
2004-03-16 21:41:30 +01:00
|
|
|
{
|
2007-06-09 07:19:37 +02:00
|
|
|
rli->report(ERROR_LEVEL, 0,
|
2005-12-22 06:39:02 +01:00
|
|
|
"\
|
|
|
|
Query caused different errors on master and slave. \
|
2003-08-11 21:44:43 +02:00
|
|
|
Error on master: '%s' (%d), Error on slave: '%s' (%d). \
|
2004-05-05 16:05:24 +02:00
|
|
|
Default database: '%s'. Query: '%s'",
|
2005-12-22 06:39:02 +01:00
|
|
|
ER_SAFE(expected_error),
|
|
|
|
expected_error,
|
2007-12-12 16:21:01 +01:00
|
|
|
actual_error ? thd->main_da.message() : "no error",
|
2005-12-22 06:39:02 +01:00
|
|
|
actual_error,
|
|
|
|
print_slave_db_safe(db), query_arg);
|
2007-10-19 23:20:38 +02:00
|
|
|
thd->is_slave_error= 1;
|
2004-03-16 21:41:30 +01:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
If we get the same error code as expected, or they should be ignored.
|
|
|
|
*/
|
|
|
|
else if (expected_error == actual_error ||
|
2004-11-12 04:01:46 +01:00
|
|
|
ignored_error_code(actual_error))
|
2004-03-16 21:41:30 +01:00
|
|
|
{
|
|
|
|
DBUG_PRINT("info",("error ignored"));
|
2007-08-16 07:37:50 +02:00
|
|
|
clear_all_errors(thd, const_cast<Relay_log_info*>(rli));
|
2007-06-20 11:05:49 +02:00
|
|
|
thd->killed= THD::NOT_KILLED;
|
2004-03-16 21:41:30 +01:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
Other cases: mostly we expected no error and get one.
|
2003-08-11 21:44:43 +02:00
|
|
|
*/
|
2007-10-19 23:20:38 +02:00
|
|
|
else if (thd->is_slave_error || thd->is_fatal_error)
|
2004-03-16 21:41:30 +01:00
|
|
|
{
|
2007-06-09 07:19:37 +02:00
|
|
|
rli->report(ERROR_LEVEL, actual_error,
|
2005-12-22 06:39:02 +01:00
|
|
|
"Error '%s' on query. Default database: '%s'. Query: '%s'",
|
2007-12-12 16:21:01 +01:00
|
|
|
(actual_error ? thd->main_da.message() :
|
2005-12-22 06:39:02 +01:00
|
|
|
"unexpected success or fatal error"),
|
|
|
|
print_slave_db_safe(thd->db), query_arg);
|
2007-10-19 23:20:38 +02:00
|
|
|
thd->is_slave_error= 1;
|
2004-03-16 21:41:30 +01:00
|
|
|
}
|
2004-11-12 04:01:46 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
TODO: compare the values of "affected rows" around here. Something
|
|
|
|
like:
|
|
|
|
if ((uint32) affected_in_event != (uint32) affected_on_slave)
|
|
|
|
{
|
|
|
|
sql_print_error("Slave: did not get the expected number of affected \
|
|
|
|
rows running query from master - expected %d, got %d (this numbers \
|
|
|
|
should have matched modulo 4294967296).", 0, ...);
|
2007-10-19 23:20:38 +02:00
|
|
|
thd->is_slave_error = 1;
|
2004-11-12 04:01:46 +01:00
|
|
|
}
|
|
|
|
We may also want an option to tell the slave to ignore "affected"
|
|
|
|
mismatch. This mismatch could be implemented with a new ER_ code, and
|
|
|
|
to ignore it you would use --slave-skip-errors...
|
2005-02-17 13:52:16 +01:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
To do the comparison we need to know the value of "affected" which the
|
|
|
|
above mysql_parse() computed. And we need to know the value of
|
|
|
|
"affected" in the master's binlog. Both will be implemented later. The
|
|
|
|
important thing is that we now have the format ready to log the values
|
|
|
|
of "affected" in the binlog. So we can release 5.0.0 before effectively
|
|
|
|
logging "affected" and effectively comparing it.
|
|
|
|
*/
|
2003-08-11 21:44:43 +02:00
|
|
|
} /* End of if (db_ok(... */
|
|
|
|
|
2004-03-16 21:41:30 +01:00
|
|
|
end:
|
2003-01-19 01:28:07 +01:00
|
|
|
VOID(pthread_mutex_lock(&LOCK_thread_count));
|
2004-11-12 04:01:46 +01:00
|
|
|
/*
|
|
|
|
Probably we have set thd->query, thd->db, thd->catalog to point to places
|
|
|
|
in the data_buf of this event. Now the event is going to be deleted
|
|
|
|
probably, so data_buf will be freed, so the thd->... listed above will be
|
|
|
|
pointers to freed memory.
|
|
|
|
So we must set them to 0, so that those bad pointers values are not later
|
2005-03-02 16:37:54 +01:00
|
|
|
used. Note that "cleanup" queries like automatic DROP TEMPORARY TABLE
|
|
|
|
don't suffer from these assignments to 0 as DROP TEMPORARY
|
|
|
|
TABLE uses the db.table syntax.
|
2004-11-12 04:01:46 +01:00
|
|
|
*/
|
A fix and a test case for
Bug#19022 "Memory bug when switching db during trigger execution"
Bug#17199 "Problem when view calls function from another database."
Bug#18444 "Fully qualified stored function names don't work correctly in
SELECT statements"
Documentation note: this patch introduces a change in behaviour of prepared
statements.
This patch adds a few new invariants with regard to how THD::db should
be used. These invariants should be preserved in future:
- one should never refer to THD::db by pointer and always make a deep copy
(strmake, strdup)
- one should never compare two databases by pointer, but use strncmp or
my_strncasecmp
- TABLE_LIST object table->db should be always initialized in the parser or
by creator of the object.
For prepared statements it means that if the current database is changed
after a statement is prepared, the database that was current at prepare
remains active. This also means that you can not prepare a statement that
implicitly refers to the current database if the latter is not set.
This is not documented, and therefore needs documentation. This is NOT a
change in behavior for almost all SQL statements except:
- ALTER TABLE t1 RENAME t2
- OPTIMIZE TABLE t1
- ANALYZE TABLE t1
- TRUNCATE TABLE t1 --
until this patch t1 or t2 could be evaluated at the first execution of
prepared statement.
CURRENT_DATABASE() still works OK and is evaluated at every execution
of prepared statement.
Note, that in stored routines this is not an issue as the default
database is the database of the stored procedure and "use" statement
is prohibited in stored routines.
This patch makes obsolete the use of check_db_used (it was never used in the
old code too) and all other places that check for table->db and assign it
from THD::db if it's NULL, except the parser.
How this patch was created: THD::{db,db_length} were replaced with a
LEX_STRING, THD::db. All the places that refer to THD::{db,db_length} were
manually checked and:
- if the place uses thd->db by pointer, it was fixed to make a deep copy
- if a place compared two db pointers, it was fixed to compare them by value
(via strcmp/my_strcasecmp, whatever was approproate)
Then this intermediate patch was used to write a smaller patch that does the
same thing but without a rename.
TODO in 5.1:
- remove check_db_used
- deploy THD::set_db in mysql_change_db
See also comments to individual files.
2006-06-26 22:47:52 +02:00
|
|
|
thd->catalog= 0;
|
2006-06-28 21:47:45 +02:00
|
|
|
thd->set_db(NULL, 0); /* will free the current database */
|
2007-11-12 22:02:12 +01:00
|
|
|
DBUG_PRINT("info", ("end: query= 0"));
|
2002-10-30 07:50:07 +01:00
|
|
|
thd->query= 0; // just to be sure
|
A fix and a test case for
Bug#19022 "Memory bug when switching db during trigger execution"
Bug#17199 "Problem when view calls function from another database."
Bug#18444 "Fully qualified stored function names don't work correctly in
SELECT statements"
Documentation note: this patch introduces a change in behaviour of prepared
statements.
This patch adds a few new invariants with regard to how THD::db should
be used. These invariants should be preserved in future:
- one should never refer to THD::db by pointer and always make a deep copy
(strmake, strdup)
- one should never compare two databases by pointer, but use strncmp or
my_strncasecmp
- TABLE_LIST object table->db should be always initialized in the parser or
by creator of the object.
For prepared statements it means that if the current database is changed
after a statement is prepared, the database that was current at prepare
remains active. This also means that you can not prepare a statement that
implicitly refers to the current database if the latter is not set.
This is not documented, and therefore needs documentation. This is NOT a
change in behavior for almost all SQL statements except:
- ALTER TABLE t1 RENAME t2
- OPTIMIZE TABLE t1
- ANALYZE TABLE t1
- TRUNCATE TABLE t1 --
until this patch t1 or t2 could be evaluated at the first execution of
prepared statement.
CURRENT_DATABASE() still works OK and is evaluated at every execution
of prepared statement.
Note, that in stored routines this is not an issue as the default
database is the database of the stored procedure and "use" statement
is prohibited in stored routines.
This patch makes obsolete the use of check_db_used (it was never used in the
old code too) and all other places that check for table->db and assign it
from THD::db if it's NULL, except the parser.
How this patch was created: THD::{db,db_length} were replaced with a
LEX_STRING, THD::db. All the places that refer to THD::{db,db_length} were
manually checked and:
- if the place uses thd->db by pointer, it was fixed to make a deep copy
- if a place compared two db pointers, it was fixed to compare them by value
(via strcmp/my_strcasecmp, whatever was approproate)
Then this intermediate patch was used to write a smaller patch that does the
same thing but without a rename.
TODO in 5.1:
- remove check_db_used
- deploy THD::set_db in mysql_change_db
See also comments to individual files.
2006-06-26 22:47:52 +02:00
|
|
|
thd->query_length= 0;
|
2003-01-19 01:28:07 +01:00
|
|
|
VOID(pthread_mutex_unlock(&LOCK_thread_count));
|
2003-08-11 21:44:43 +02:00
|
|
|
close_thread_tables(thd);
|
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
|
|
|
/*
|
|
|
|
As a disk space optimization, future masters will not log an event for
|
|
|
|
LAST_INSERT_ID() if that function returned 0 (and thus they will be able
|
|
|
|
to replace the THD::stmt_depends_on_first_successful_insert_id_in_prev_stmt
|
|
|
|
variable by (THD->first_successful_insert_id_in_prev_stmt > 0) ; with the
|
|
|
|
resetting below we are ready to support that.
|
|
|
|
*/
|
|
|
|
thd->first_successful_insert_id_in_prev_stmt_for_binlog= 0;
|
|
|
|
thd->first_successful_insert_id_in_prev_stmt= 0;
|
|
|
|
thd->stmt_depends_on_first_successful_insert_id_in_prev_stmt= 0;
|
2004-11-08 00:13:54 +01:00
|
|
|
free_root(thd->mem_root,MYF(MY_KEEP_PREALLOC));
|
2007-10-19 23:20:38 +02:00
|
|
|
return thd->is_slave_error;
|
2006-11-10 15:10:41 +01:00
|
|
|
}
|
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
int Query_log_event::do_update_pos(Relay_log_info *rli)
|
2006-11-10 15:10:41 +01:00
|
|
|
{
|
2004-09-23 12:16:56 +02:00
|
|
|
/*
|
2006-11-10 15:10:41 +01:00
|
|
|
Note that we will not increment group* positions if we are just
|
|
|
|
after a SET ONE_SHOT, because SET ONE_SHOT should not be separated
|
|
|
|
from its following updating query.
|
2004-09-23 12:16:56 +02:00
|
|
|
*/
|
2006-11-10 15:10:41 +01:00
|
|
|
if (thd->one_shot_set)
|
|
|
|
{
|
|
|
|
rli->inc_event_relay_log_pos();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return Log_event::do_update_pos(rli);
|
2001-06-21 21:19:24 +02:00
|
|
|
}
|
2006-11-10 15:10:41 +01:00
|
|
|
|
|
|
|
|
2007-10-19 14:18:41 +02:00
|
|
|
Log_event::enum_skip_reason
|
|
|
|
Query_log_event::do_shall_skip(Relay_log_info *rli)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("Query_log_event::do_shall_skip");
|
|
|
|
DBUG_PRINT("debug", ("query: %s; q_len: %d", query, q_len));
|
|
|
|
DBUG_ASSERT(query && q_len > 0);
|
|
|
|
|
|
|
|
if (rli->slave_skip_counter > 0)
|
|
|
|
{
|
|
|
|
if (strcmp("BEGIN", query) == 0)
|
|
|
|
{
|
|
|
|
thd->options|= OPTION_BEGIN;
|
|
|
|
DBUG_RETURN(Log_event::continue_group(rli));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (strcmp("COMMIT", query) == 0 || strcmp("ROLLBACK", query) == 0)
|
|
|
|
{
|
|
|
|
thd->options&= ~OPTION_BEGIN;
|
|
|
|
DBUG_RETURN(Log_event::EVENT_SKIP_COUNT);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
DBUG_RETURN(Log_event::do_shall_skip(rli));
|
|
|
|
}
|
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
#endif
|
2001-06-21 21:19:24 +02:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2003-05-21 20:39:58 +02:00
|
|
|
/**************************************************************************
|
2004-11-12 04:01:46 +01:00
|
|
|
Start_log_event_v3 methods
|
2003-05-21 20:39:58 +02:00
|
|
|
**************************************************************************/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
#ifndef MYSQL_CLIENT
|
2007-08-14 14:20:05 +02:00
|
|
|
Start_log_event_v3::Start_log_event_v3()
|
|
|
|
:Log_event(), created(0), binlog_version(BINLOG_VERSION),
|
2008-09-28 09:34:25 +02:00
|
|
|
dont_set_created(0)
|
2004-11-12 04:01:46 +01:00
|
|
|
{
|
|
|
|
memcpy(server_version, ::server_version, ST_SERVER_VER_LEN);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2004-11-12 04:01:46 +01:00
|
|
|
Start_log_event_v3::pack_info()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2004-11-12 04:01:46 +01:00
|
|
|
void Start_log_event_v3::pack_info(Protocol *protocol)
|
2002-10-25 00:48:34 +02:00
|
|
|
{
|
2003-01-17 13:39:29 +01:00
|
|
|
char buf[12 + ST_SERVER_VER_LEN + 14 + 22], *pos;
|
|
|
|
pos= strmov(buf, "Server ver: ");
|
|
|
|
pos= strmov(pos, server_version);
|
|
|
|
pos= strmov(pos, ", Binlog ver: ");
|
2003-08-11 21:44:43 +02:00
|
|
|
pos= int10_to_str(binlog_version, pos, 10);
|
|
|
|
protocol->store(buf, (uint) (pos-buf), &my_charset_bin);
|
2002-10-25 00:48:34 +02:00
|
|
|
}
|
2003-01-15 09:11:44 +01:00
|
|
|
#endif
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2004-11-12 04:01:46 +01:00
|
|
|
Start_log_event_v3::print()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-25 00:48:34 +02:00
|
|
|
|
|
|
|
#ifdef MYSQL_CLIENT
|
2005-10-19 19:31:24 +02:00
|
|
|
void Start_log_event_v3::print(FILE* file, PRINT_EVENT_INFO* print_event_info)
|
2002-10-25 00:48:34 +02:00
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
DBUG_ENTER("Start_log_event_v3::print");
|
|
|
|
|
|
|
|
Write_on_release_cache cache(&print_event_info->head_cache, file,
|
|
|
|
Write_on_release_cache::FLUSH_F);
|
|
|
|
|
2005-10-19 19:31:24 +02:00
|
|
|
if (!print_event_info->short_form)
|
2004-11-12 04:01:46 +01:00
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
print_header(&cache, print_event_info, FALSE);
|
|
|
|
my_b_printf(&cache, "\tStart: binlog v %d, server v %s created ",
|
|
|
|
binlog_version, server_version);
|
|
|
|
print_timestamp(&cache);
|
2004-11-12 04:01:46 +01:00
|
|
|
if (created)
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(&cache," at startup");
|
|
|
|
my_b_printf(&cache, "\n");
|
2005-03-02 10:38:25 +01:00
|
|
|
if (flags & LOG_EVENT_BINLOG_IN_USE_F)
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(&cache, "# Warning: this binlog was not closed properly. "
|
|
|
|
"Most probably mysqld crashed writing it.\n");
|
2004-11-12 04:01:46 +01:00
|
|
|
}
|
2008-09-28 09:34:25 +02:00
|
|
|
if (!is_artificial_event() && created)
|
2005-02-17 13:52:16 +01:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
#ifdef WHEN_WE_HAVE_THE_RESET_CONNECTION_SQL_COMMAND
|
2005-02-17 13:52:16 +01:00
|
|
|
/*
|
|
|
|
This is for mysqlbinlog: like in replication, we want to delete the stale
|
|
|
|
tmp files left by an unclean shutdown of mysqld (temporary tables)
|
|
|
|
and rollback unfinished transaction.
|
|
|
|
Probably this can be done with RESET CONNECTION (syntax to be defined).
|
|
|
|
*/
|
2006-12-08 07:33:05 +01:00
|
|
|
my_b_printf(&cache,"RESET CONNECTION%s\n", print_event_info->delimiter);
|
2005-02-17 13:52:16 +01:00
|
|
|
#else
|
2006-12-08 07:33:05 +01:00
|
|
|
my_b_printf(&cache,"ROLLBACK%s\n", print_event_info->delimiter);
|
2004-11-12 04:01:46 +01:00
|
|
|
#endif
|
2005-02-17 13:52:16 +01:00
|
|
|
}
|
BUG#32407: Impossible to do point-in-time recovery from older binlog
Problem: it is unsafe to read base64-printed events without first
reading the Format_description_log_event (FD). Currently, mysqlbinlog
cannot print the FD.
As a side effect, another bug has also been fixed: When mysqlbinlog
--start-position=X was specified, no ROLLBACK was printed. I changed
this, so that ROLLBACK is always printed.
This patch does several things:
- Format_description_log_event (FD) now print themselves in base64
format.
- mysqlbinlog is now able to print FD events. It has three modes:
--base64-output=auto Print row events in base64 output, and print
FD event. The FD event is printed even if
it is outside the range specified with
--start-position, because it would not be
safe to read row events otherwise. This is
the default.
--base64-output=always Like --base64-output=auto, but also print
base64 output for query events. This is
like the old --base64-output flag, which
is also a shorthand for
--base64-output=always
--base64-output=never Never print base64 output, generate error if
row events occur in binlog. This is
useful to suppress the FD event in binlogs
known not to contain row events (e.g.,
because BINLOG statement is unsafe,
requires root privileges, is not SQL, etc)
- the BINLOG statement now handles FD events correctly, by setting
the thread's rli's relay log's description_event_for_exec to the
loaded event.
In fact, executing a BINLOG statement is almost the same as reading
an event from a relay log. Before my patch, the code for this was
separated (exec_relay_log_event in slave.cc executes events from
the relay log, mysql_client_binlog_statement in sql_binlog.cc
executes BINLOG statements). I needed to augment
mysql_client_binlog_statement to do parts of what
exec_relay_log_event does. Hence, I did a small refactoring and
moved parts of exec_relay_log_event to a new function, which I
named apply_event_and_update_pos. apply_event_and_update_pos is
called both from exec_relay_log_event and from
mysql_client_binlog_statement.
- When a non-FD event is executed in a BINLOG statement, without
previously executing a FD event in a BINLOG statement, it generates
an error, because that's unsafe. I took a new error code for that:
ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENTS.
In order to get a decent error message containing the name of the
event, I added the class method char*
Log_event::get_type_str(Log_event_type type), which returns a
string name for the given Log_event_type. This is just like the
existing char* Log_event::get_type_str(), except it is a class
method that takes the log event type as parameter.
I also added PRE_GA_*_ROWS_LOG_EVENT to Log_event::get_type_str(),
so that names of old rows event are properly printed.
- When reading an event, I added a check that the event type is known
by the current Format_description_log_event. Without this, it may
crash on bad input (and I was struck by this several times).
- I patched the following test cases, which all contain BINLOG
statements for row events which must be preceded by BINLOG
statements for FD events:
- rpl_bug31076
While I was here, I fixed some small things in log_event.cc:
- replaced hard-coded 4 by EVENT_TYPE_OFFSET in 3 places
- replaced return by DBUG_VOID_RETURN in one place
- The name of the logfile can be '-' to indicate stdin. Before my
patch, the code just checked if the first character is '-'; now it
does a full strcmp(). Probably, all arguments that begin with a -
are already handled somewhere else as flags, but I still think it
is better that the code reflects what it is supposed to do, with as
little dependencies as possible on other parts of the code. If we
one day implement that all command line arguments after -- are
files (as most unix tools do), then we need this.
I also fixed the following in slave.cc:
- next_event() was declared twice, and queue_event was not static but
should be static (not used outside the file).
2007-12-14 19:02:02 +01:00
|
|
|
if (temp_buf &&
|
|
|
|
print_event_info->base64_output_mode != BASE64_OUTPUT_NEVER &&
|
|
|
|
!print_event_info->short_form)
|
|
|
|
{
|
2008-08-21 13:47:23 +02:00
|
|
|
if (print_event_info->base64_output_mode != BASE64_OUTPUT_DECODE_ROWS)
|
|
|
|
my_b_printf(&cache, "BINLOG '\n");
|
BUG#32407: Impossible to do point-in-time recovery from older binlog
Problem: it is unsafe to read base64-printed events without first
reading the Format_description_log_event (FD). Currently, mysqlbinlog
cannot print the FD.
As a side effect, another bug has also been fixed: When mysqlbinlog
--start-position=X was specified, no ROLLBACK was printed. I changed
this, so that ROLLBACK is always printed.
This patch does several things:
- Format_description_log_event (FD) now print themselves in base64
format.
- mysqlbinlog is now able to print FD events. It has three modes:
--base64-output=auto Print row events in base64 output, and print
FD event. The FD event is printed even if
it is outside the range specified with
--start-position, because it would not be
safe to read row events otherwise. This is
the default.
--base64-output=always Like --base64-output=auto, but also print
base64 output for query events. This is
like the old --base64-output flag, which
is also a shorthand for
--base64-output=always
--base64-output=never Never print base64 output, generate error if
row events occur in binlog. This is
useful to suppress the FD event in binlogs
known not to contain row events (e.g.,
because BINLOG statement is unsafe,
requires root privileges, is not SQL, etc)
- the BINLOG statement now handles FD events correctly, by setting
the thread's rli's relay log's description_event_for_exec to the
loaded event.
In fact, executing a BINLOG statement is almost the same as reading
an event from a relay log. Before my patch, the code for this was
separated (exec_relay_log_event in slave.cc executes events from
the relay log, mysql_client_binlog_statement in sql_binlog.cc
executes BINLOG statements). I needed to augment
mysql_client_binlog_statement to do parts of what
exec_relay_log_event does. Hence, I did a small refactoring and
moved parts of exec_relay_log_event to a new function, which I
named apply_event_and_update_pos. apply_event_and_update_pos is
called both from exec_relay_log_event and from
mysql_client_binlog_statement.
- When a non-FD event is executed in a BINLOG statement, without
previously executing a FD event in a BINLOG statement, it generates
an error, because that's unsafe. I took a new error code for that:
ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENTS.
In order to get a decent error message containing the name of the
event, I added the class method char*
Log_event::get_type_str(Log_event_type type), which returns a
string name for the given Log_event_type. This is just like the
existing char* Log_event::get_type_str(), except it is a class
method that takes the log event type as parameter.
I also added PRE_GA_*_ROWS_LOG_EVENT to Log_event::get_type_str(),
so that names of old rows event are properly printed.
- When reading an event, I added a check that the event type is known
by the current Format_description_log_event. Without this, it may
crash on bad input (and I was struck by this several times).
- I patched the following test cases, which all contain BINLOG
statements for row events which must be preceded by BINLOG
statements for FD events:
- rpl_bug31076
While I was here, I fixed some small things in log_event.cc:
- replaced hard-coded 4 by EVENT_TYPE_OFFSET in 3 places
- replaced return by DBUG_VOID_RETURN in one place
- The name of the logfile can be '-' to indicate stdin. Before my
patch, the code just checked if the first character is '-'; now it
does a full strcmp(). Probably, all arguments that begin with a -
are already handled somewhere else as flags, but I still think it
is better that the code reflects what it is supposed to do, with as
little dependencies as possible on other parts of the code. If we
one day implement that all command line arguments after -- are
files (as most unix tools do), then we need this.
I also fixed the following in slave.cc:
- next_event() was declared twice, and queue_event was not static but
should be static (not used outside the file).
2007-12-14 19:02:02 +01:00
|
|
|
print_base64(&cache, print_event_info, FALSE);
|
|
|
|
print_event_info->printed_fd_event= TRUE;
|
|
|
|
}
|
2006-10-06 10:17:02 +02:00
|
|
|
DBUG_VOID_RETURN;
|
2002-10-25 00:48:34 +02:00
|
|
|
}
|
2003-05-19 15:35:49 +02:00
|
|
|
#endif /* MYSQL_CLIENT */
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2004-11-12 04:01:46 +01:00
|
|
|
Start_log_event_v3::Start_log_event_v3()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
Start_log_event_v3::Start_log_event_v3(const char* buf,
|
2007-08-14 14:20:05 +02:00
|
|
|
const Format_description_log_event
|
|
|
|
*description_event)
|
2004-11-12 04:01:46 +01:00
|
|
|
:Log_event(buf, description_event)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
buf+= description_event->common_header_len;
|
|
|
|
binlog_version= uint2korr(buf+ST_BINLOG_VER_OFFSET);
|
2002-10-30 07:50:07 +01:00
|
|
|
memcpy(server_version, buf+ST_SERVER_VER_OFFSET,
|
|
|
|
ST_SERVER_VER_LEN);
|
Fix for BUG#24432
"INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values".
When in an INSERT ON DUPLICATE KEY UPDATE, using
an autoincrement column, we inserted some autogenerated values and
also updated some rows, some autogenerated values were not used
(for example, even if 10 was the largest autoinc value in the table
at the start of the statement, 12 could be the first autogenerated
value inserted by the statement, instead of 11). One autogenerated
value was lost per updated row. Led to exhausting the range of the
autoincrement column faster.
Bug introduced by fix of BUG#20188; present since 5.0.24 and 5.1.12.
This bug breaks replication from a pre-5.0.24 master.
But the present bugfix, as it makes INSERT ON DUP KEY UPDATE
behave like pre-5.0.24, breaks replication from a [5.0.24,5.0.34]
master to a fixed (5.0.36) slave! To warn users against this when
they upgrade their slave, as agreed with the support team, we add
code for a fixed slave to detect that it is connected to a buggy
master in a situation (INSERT ON DUP KEY UPDATE into autoinc column)
likely to break replication, in which case it cannot replicate so
stops and prints a message to the slave's error log and to SHOW SLAVE
STATUS.
For 5.0.36->[5.0.24,5.0.34] replication we cannot warn as master
does not know the slave's version (but we always recommended to users
to have slave at least as new as master).
As agreed with support, I'll also ask for an alert to be put into
the MySQL Network Monitoring and Advisory Service.
2007-02-08 15:53:14 +01:00
|
|
|
// prevent overrun if log is corrupted on disk
|
|
|
|
server_version[ST_SERVER_VER_LEN-1]= 0;
|
2004-11-12 04:01:46 +01:00
|
|
|
created= uint4korr(buf+ST_CREATED_OFFSET);
|
2007-08-14 14:20:05 +02:00
|
|
|
dont_set_created= 1;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
2001-09-21 02:38:35 +02:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2004-11-12 04:01:46 +01:00
|
|
|
Start_log_event_v3::write()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2005-03-22 00:26:12 +01:00
|
|
|
#ifndef MYSQL_CLIENT
|
2004-11-12 04:01:46 +01:00
|
|
|
bool Start_log_event_v3::write(IO_CACHE* file)
|
2001-09-21 02:38:35 +02:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
char buff[START_V3_HEADER_LEN];
|
2002-10-30 07:50:07 +01:00
|
|
|
int2store(buff + ST_BINLOG_VER_OFFSET,binlog_version);
|
|
|
|
memcpy(buff + ST_SERVER_VER_OFFSET,server_version,ST_SERVER_VER_LEN);
|
2007-08-14 14:20:05 +02:00
|
|
|
if (!dont_set_created)
|
|
|
|
created= when= get_time();
|
2002-10-30 07:50:07 +01:00
|
|
|
int4store(buff + ST_CREATED_OFFSET,created);
|
2004-11-12 04:01:46 +01:00
|
|
|
return (write_header(file, sizeof(buff)) ||
|
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_b_safe_write(file, (uchar*) buff, sizeof(buff)));
|
2001-09-21 02:38:35 +02:00
|
|
|
}
|
2005-03-22 00:26:12 +01:00
|
|
|
#endif
|
2001-08-19 04:22:20 +02:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
Start_log_event_v3::do_apply_event() .
|
2002-10-30 07:50:07 +01:00
|
|
|
The master started
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
IMPLEMENTATION
|
2003-08-11 21:44:43 +02:00
|
|
|
- To handle the case where the master died without having time to write
|
2007-10-11 19:29:09 +02:00
|
|
|
DROP TEMPORARY TABLE, DO RELEASE_LOCK (prepared statements' deletion is
|
|
|
|
TODO), we clean up all temporary tables that we got, if we are sure we
|
|
|
|
can (see below).
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@todo
|
2003-06-12 16:20:31 +02:00
|
|
|
- Remove all active user locks.
|
2007-10-11 19:29:09 +02:00
|
|
|
Guilhem 2003-06: this is true but not urgent: the worst it can cause is
|
|
|
|
the use of a bit of memory for a user lock which will not be used
|
|
|
|
anymore. If the user lock is later used, the old one will be released. In
|
|
|
|
other words, no deadlock problem.
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
int Start_log_event_v3::do_apply_event(Relay_log_info const *rli)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
2006-11-10 15:10:41 +01:00
|
|
|
DBUG_ENTER("Start_log_event_v3::do_apply_event");
|
2007-10-11 19:29:09 +02:00
|
|
|
switch (binlog_version)
|
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
case 3:
|
|
|
|
case 4:
|
|
|
|
/*
|
|
|
|
This can either be 4.x (then a Start_log_event_v3 is only at master
|
|
|
|
startup so we are sure the master has restarted and cleared his temp
|
|
|
|
tables; the event always has 'created'>0) or 5.0 (then we have to test
|
|
|
|
'created').
|
2003-08-11 21:44:43 +02:00
|
|
|
*/
|
2004-11-12 04:01:46 +01:00
|
|
|
if (created)
|
|
|
|
{
|
|
|
|
close_temporary_tables(thd);
|
|
|
|
cleanup_load_tmpdir();
|
|
|
|
}
|
2008-10-07 15:21:17 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Set all temporary tables thread references to the current thread
|
|
|
|
as they may point to the "old" SQL slave thread in case of its
|
|
|
|
restart.
|
|
|
|
*/
|
|
|
|
TABLE *table;
|
|
|
|
for (table= thd->temporary_tables; table; table= table->next)
|
|
|
|
table->in_use= thd;
|
|
|
|
}
|
2003-08-11 21:44:43 +02:00
|
|
|
break;
|
|
|
|
|
2005-02-17 13:52:16 +01:00
|
|
|
/*
|
2003-08-11 21:44:43 +02:00
|
|
|
Now the older formats; in that case load_tmpdir is cleaned up by the I/O
|
|
|
|
thread.
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2004-11-12 04:01:46 +01:00
|
|
|
case 1:
|
2005-02-17 13:52:16 +01:00
|
|
|
if (strncmp(rli->relay_log.description_event_for_exec->server_version,
|
2004-11-12 04:01:46 +01:00
|
|
|
"3.23.57",7) >= 0 && created)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Can distinguish, based on the value of 'created': this event was
|
|
|
|
generated at master startup.
|
|
|
|
*/
|
|
|
|
close_temporary_tables(thd);
|
|
|
|
}
|
2003-08-11 21:44:43 +02:00
|
|
|
/*
|
2004-11-12 04:01:46 +01:00
|
|
|
Otherwise, can't distinguish a Start_log_event generated at
|
|
|
|
master startup and one generated by master FLUSH LOGS, so cannot
|
|
|
|
be sure temp tables have to be dropped. So do nothing.
|
2003-08-11 21:44:43 +02:00
|
|
|
*/
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* this case is impossible */
|
2004-11-12 04:01:46 +01:00
|
|
|
DBUG_RETURN(1);
|
2002-10-22 23:17:17 +02:00
|
|
|
}
|
2006-11-10 15:10:41 +01:00
|
|
|
DBUG_RETURN(0);
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
2003-05-19 15:35:49 +02:00
|
|
|
#endif /* defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) */
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
/***************************************************************************
|
|
|
|
Format_description_log_event methods
|
|
|
|
****************************************************************************/
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
2004-11-12 04:01:46 +01:00
|
|
|
Format_description_log_event 1st ctor.
|
|
|
|
|
|
|
|
Ctor. Can be used to create the event to write to the binary log (when the
|
|
|
|
server starts or when FLUSH LOGS), or to create artificial events to parse
|
|
|
|
binlogs from MySQL 3.23 or 4.x.
|
|
|
|
When in a client, only the 2nd use is possible.
|
2007-10-11 19:29:09 +02:00
|
|
|
|
|
|
|
@param binlog_version the binlog version for which we want to build
|
|
|
|
an event. Can be 1 (=MySQL 3.23), 3 (=4.0.x
|
|
|
|
x>=2 and 4.1) or 4 (MySQL 5.0). Note that the
|
|
|
|
old 4.0 (binlog version 2) is not supported;
|
|
|
|
it should not be used for replication with
|
|
|
|
5.0.
|
2004-11-12 04:01:46 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
Format_description_log_event::
|
2005-01-16 13:16:23 +01:00
|
|
|
Format_description_log_event(uint8 binlog_ver, const char* server_ver)
|
2008-01-10 16:39:44 +01:00
|
|
|
:Start_log_event_v3(), event_type_permutation(0)
|
2004-11-12 04:01:46 +01:00
|
|
|
{
|
|
|
|
binlog_version= binlog_ver;
|
|
|
|
switch (binlog_ver) {
|
|
|
|
case 4: /* MySQL 5.0 */
|
|
|
|
memcpy(server_version, ::server_version, ST_SERVER_VER_LEN);
|
Fix for BUG#24432
"INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values".
When in an INSERT ON DUPLICATE KEY UPDATE, using
an autoincrement column, we inserted some autogenerated values and
also updated some rows, some autogenerated values were not used
(for example, even if 10 was the largest autoinc value in the table
at the start of the statement, 12 could be the first autogenerated
value inserted by the statement, instead of 11). One autogenerated
value was lost per updated row. Led to exhausting the range of the
autoincrement column faster.
Bug introduced by fix of BUG#20188; present since 5.0.24 and 5.1.12.
This bug breaks replication from a pre-5.0.24 master.
But the present bugfix, as it makes INSERT ON DUP KEY UPDATE
behave like pre-5.0.24, breaks replication from a [5.0.24,5.0.34]
master to a fixed (5.0.36) slave! To warn users against this when
they upgrade their slave, as agreed with the support team, we add
code for a fixed slave to detect that it is connected to a buggy
master in a situation (INSERT ON DUP KEY UPDATE into autoinc column)
likely to break replication, in which case it cannot replicate so
stops and prints a message to the slave's error log and to SHOW SLAVE
STATUS.
For 5.0.36->[5.0.24,5.0.34] replication we cannot warn as master
does not know the slave's version (but we always recommended to users
to have slave at least as new as master).
As agreed with support, I'll also ask for an alert to be put into
the MySQL Network Monitoring and Advisory Service.
2007-02-08 15:53:14 +01:00
|
|
|
DBUG_EXECUTE_IF("pretend_version_50034_in_binlog",
|
|
|
|
strmov(server_version, "5.0.34"););
|
2004-11-12 04:01:46 +01:00
|
|
|
common_header_len= LOG_EVENT_HEADER_LEN;
|
|
|
|
number_of_event_types= LOG_EVENT_TYPES;
|
|
|
|
/* we'll catch my_malloc() error in is_valid() */
|
|
|
|
post_header_len=(uint8*) my_malloc(number_of_event_types*sizeof(uint8),
|
2009-01-09 10:48:01 +01:00
|
|
|
MYF(0));
|
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
/*
|
|
|
|
This long list of assignments is not beautiful, but I see no way to
|
|
|
|
make it nicer, as the right members are #defines, not array members, so
|
|
|
|
it's impossible to write a loop.
|
|
|
|
*/
|
|
|
|
if (post_header_len)
|
|
|
|
{
|
2009-01-09 10:48:01 +01:00
|
|
|
// Allows us to sanity-check that all events initialized their
|
|
|
|
// events (see the end of this 'if' block).
|
|
|
|
IF_DBUG(memset(post_header_len, 255,
|
|
|
|
number_of_event_types*sizeof(uint8)););
|
|
|
|
|
|
|
|
/* Note: all event types must explicitly fill in their lengths here. */
|
2004-11-12 04:01:46 +01:00
|
|
|
post_header_len[START_EVENT_V3-1]= START_V3_HEADER_LEN;
|
|
|
|
post_header_len[QUERY_EVENT-1]= QUERY_HEADER_LEN;
|
2009-01-09 10:48:01 +01:00
|
|
|
post_header_len[STOP_EVENT-1]= STOP_HEADER_LEN;
|
2004-11-12 04:01:46 +01:00
|
|
|
post_header_len[ROTATE_EVENT-1]= ROTATE_HEADER_LEN;
|
2009-01-09 10:48:01 +01:00
|
|
|
post_header_len[INTVAR_EVENT-1]= INTVAR_HEADER_LEN;
|
2004-11-12 04:01:46 +01:00
|
|
|
post_header_len[LOAD_EVENT-1]= LOAD_HEADER_LEN;
|
2009-01-09 10:48:01 +01:00
|
|
|
post_header_len[SLAVE_EVENT-1]= SLAVE_HEADER_LEN;
|
2004-11-12 04:01:46 +01:00
|
|
|
post_header_len[CREATE_FILE_EVENT-1]= CREATE_FILE_HEADER_LEN;
|
|
|
|
post_header_len[APPEND_BLOCK_EVENT-1]= APPEND_BLOCK_HEADER_LEN;
|
|
|
|
post_header_len[EXEC_LOAD_EVENT-1]= EXEC_LOAD_HEADER_LEN;
|
|
|
|
post_header_len[DELETE_FILE_EVENT-1]= DELETE_FILE_HEADER_LEN;
|
2009-01-09 10:48:01 +01:00
|
|
|
post_header_len[NEW_LOAD_EVENT-1]= NEW_LOAD_HEADER_LEN;
|
|
|
|
post_header_len[RAND_EVENT-1]= RAND_HEADER_LEN;
|
|
|
|
post_header_len[USER_VAR_EVENT-1]= USER_VAR_HEADER_LEN;
|
2004-11-12 04:01:46 +01:00
|
|
|
post_header_len[FORMAT_DESCRIPTION_EVENT-1]= FORMAT_DESCRIPTION_HEADER_LEN;
|
2009-01-09 10:48:01 +01:00
|
|
|
post_header_len[XID_EVENT-1]= XID_HEADER_LEN;
|
|
|
|
post_header_len[BEGIN_LOAD_QUERY_EVENT-1]= BEGIN_LOAD_QUERY_HEADER_LEN;
|
|
|
|
post_header_len[EXECUTE_LOAD_QUERY_EVENT-1]= EXECUTE_LOAD_QUERY_HEADER_LEN;
|
|
|
|
/*
|
|
|
|
The PRE_GA events are never be written to any binlog, but
|
|
|
|
their lengths are included in Format_description_log_event.
|
|
|
|
Hence, we need to be assign some value here, to avoid reading
|
|
|
|
uninitialized memory when the array is written to disk.
|
|
|
|
*/
|
|
|
|
post_header_len[PRE_GA_WRITE_ROWS_EVENT-1] = 0;
|
|
|
|
post_header_len[PRE_GA_UPDATE_ROWS_EVENT-1] = 0;
|
|
|
|
post_header_len[PRE_GA_DELETE_ROWS_EVENT-1] = 0;
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
post_header_len[TABLE_MAP_EVENT-1]= TABLE_MAP_HEADER_LEN;
|
|
|
|
post_header_len[WRITE_ROWS_EVENT-1]= ROWS_HEADER_LEN;
|
|
|
|
post_header_len[UPDATE_ROWS_EVENT-1]= ROWS_HEADER_LEN;
|
|
|
|
post_header_len[DELETE_ROWS_EVENT-1]= ROWS_HEADER_LEN;
|
|
|
|
/*
|
|
|
|
We here have the possibility to simulate a master of before we changed
|
|
|
|
the table map id to be stored in 6 bytes: when it was stored in 4
|
|
|
|
bytes (=> post_header_len was 6). This is used to test backward
|
|
|
|
compatibility.
|
|
|
|
This code can be removed after a few months (today is Dec 21st 2005),
|
|
|
|
when we know that the 4-byte masters are not deployed anymore (check
|
|
|
|
with Tomas Ulin first!), and the accompanying test (rpl_row_4_bytes)
|
|
|
|
too.
|
|
|
|
*/
|
|
|
|
DBUG_EXECUTE_IF("old_row_based_repl_4_byte_map_id_master",
|
|
|
|
post_header_len[TABLE_MAP_EVENT-1]=
|
|
|
|
post_header_len[WRITE_ROWS_EVENT-1]=
|
|
|
|
post_header_len[UPDATE_ROWS_EVENT-1]=
|
|
|
|
post_header_len[DELETE_ROWS_EVENT-1]= 6;);
|
2007-03-29 20:31:09 +02:00
|
|
|
post_header_len[INCIDENT_EVENT-1]= INCIDENT_HEADER_LEN;
|
2009-01-09 10:48:01 +01:00
|
|
|
|
|
|
|
// Sanity-check that all post header lengths are initialized.
|
|
|
|
IF_DBUG({
|
|
|
|
int i;
|
|
|
|
for (i=0; i<number_of_event_types; i++)
|
|
|
|
assert(post_header_len[i] != 255);
|
|
|
|
});
|
2004-11-12 04:01:46 +01:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 1: /* 3.23 */
|
|
|
|
case 3: /* 4.0.x x>=2 */
|
|
|
|
/*
|
|
|
|
We build an artificial (i.e. not sent by the master) event, which
|
|
|
|
describes what those old master versions send.
|
|
|
|
*/
|
|
|
|
if (binlog_ver==1)
|
|
|
|
strmov(server_version, server_ver ? server_ver : "3.23");
|
|
|
|
else
|
|
|
|
strmov(server_version, server_ver ? server_ver : "4.0");
|
|
|
|
common_header_len= binlog_ver==1 ? OLD_HEADER_LEN :
|
2005-02-17 13:52:16 +01:00
|
|
|
LOG_EVENT_MINIMAL_HEADER_LEN;
|
2004-11-12 04:01:46 +01:00
|
|
|
/*
|
|
|
|
The first new event in binlog version 4 is Format_desc. So any event type
|
|
|
|
after that does not exist in older versions. We use the events known by
|
|
|
|
version 3, even if version 1 had only a subset of them (this is not a
|
|
|
|
problem: it uses a few bytes for nothing but unifies code; it does not
|
|
|
|
make the slave detect less corruptions).
|
|
|
|
*/
|
|
|
|
number_of_event_types= FORMAT_DESCRIPTION_EVENT - 1;
|
|
|
|
post_header_len=(uint8*) my_malloc(number_of_event_types*sizeof(uint8),
|
2005-02-17 13:52:16 +01:00
|
|
|
MYF(0));
|
2004-11-12 04:01:46 +01:00
|
|
|
if (post_header_len)
|
|
|
|
{
|
|
|
|
post_header_len[START_EVENT_V3-1]= START_V3_HEADER_LEN;
|
|
|
|
post_header_len[QUERY_EVENT-1]= QUERY_HEADER_MINIMAL_LEN;
|
|
|
|
post_header_len[STOP_EVENT-1]= 0;
|
|
|
|
post_header_len[ROTATE_EVENT-1]= (binlog_ver==1) ? 0 : ROTATE_HEADER_LEN;
|
|
|
|
post_header_len[INTVAR_EVENT-1]= 0;
|
|
|
|
post_header_len[LOAD_EVENT-1]= LOAD_HEADER_LEN;
|
|
|
|
post_header_len[SLAVE_EVENT-1]= 0;
|
|
|
|
post_header_len[CREATE_FILE_EVENT-1]= CREATE_FILE_HEADER_LEN;
|
|
|
|
post_header_len[APPEND_BLOCK_EVENT-1]= APPEND_BLOCK_HEADER_LEN;
|
|
|
|
post_header_len[EXEC_LOAD_EVENT-1]= EXEC_LOAD_HEADER_LEN;
|
|
|
|
post_header_len[DELETE_FILE_EVENT-1]= DELETE_FILE_HEADER_LEN;
|
|
|
|
post_header_len[NEW_LOAD_EVENT-1]= post_header_len[LOAD_EVENT-1];
|
|
|
|
post_header_len[RAND_EVENT-1]= 0;
|
|
|
|
post_header_len[USER_VAR_EVENT-1]= 0;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default: /* Includes binlog version 2 i.e. 4.0.x x<=1 */
|
|
|
|
post_header_len= 0; /* will make is_valid() fail */
|
|
|
|
break;
|
|
|
|
}
|
Fix for BUG#24432
"INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values".
When in an INSERT ON DUPLICATE KEY UPDATE, using
an autoincrement column, we inserted some autogenerated values and
also updated some rows, some autogenerated values were not used
(for example, even if 10 was the largest autoinc value in the table
at the start of the statement, 12 could be the first autogenerated
value inserted by the statement, instead of 11). One autogenerated
value was lost per updated row. Led to exhausting the range of the
autoincrement column faster.
Bug introduced by fix of BUG#20188; present since 5.0.24 and 5.1.12.
This bug breaks replication from a pre-5.0.24 master.
But the present bugfix, as it makes INSERT ON DUP KEY UPDATE
behave like pre-5.0.24, breaks replication from a [5.0.24,5.0.34]
master to a fixed (5.0.36) slave! To warn users against this when
they upgrade their slave, as agreed with the support team, we add
code for a fixed slave to detect that it is connected to a buggy
master in a situation (INSERT ON DUP KEY UPDATE into autoinc column)
likely to break replication, in which case it cannot replicate so
stops and prints a message to the slave's error log and to SHOW SLAVE
STATUS.
For 5.0.36->[5.0.24,5.0.34] replication we cannot warn as master
does not know the slave's version (but we always recommended to users
to have slave at least as new as master).
As agreed with support, I'll also ask for an alert to be put into
the MySQL Network Monitoring and Advisory Service.
2007-02-08 15:53:14 +01:00
|
|
|
calc_server_version_split();
|
2004-11-12 04:01:46 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
2004-11-12 04:01:46 +01:00
|
|
|
The problem with this constructor is that the fixed header may have a
|
|
|
|
length different from this version, but we don't know this length as we
|
|
|
|
have not read the Format_description_log_event which says it, yet. This
|
|
|
|
length is in the post-header of the event, but we don't know where the
|
2005-02-17 13:52:16 +01:00
|
|
|
post-header starts.
|
2007-10-11 19:29:09 +02:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
So this type of event HAS to:
|
|
|
|
- either have the header's length at the beginning (in the header, at a
|
|
|
|
fixed position which will never be changed), not in the post-header. That
|
|
|
|
would make the header be "shifted" compared to other events.
|
|
|
|
- or have a header of size LOG_EVENT_MINIMAL_HEADER_LEN (19), in all future
|
|
|
|
versions, so that we know for sure.
|
2007-10-11 19:29:09 +02:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
I (Guilhem) chose the 2nd solution. Rotate has the same constraint (because
|
|
|
|
it is sent before Format_description_log_event).
|
|
|
|
*/
|
|
|
|
|
|
|
|
Format_description_log_event::
|
|
|
|
Format_description_log_event(const char* buf,
|
|
|
|
uint event_len,
|
|
|
|
const
|
|
|
|
Format_description_log_event*
|
2005-02-17 13:52:16 +01:00
|
|
|
description_event)
|
2008-01-10 16:39:44 +01:00
|
|
|
:Start_log_event_v3(buf, description_event), event_type_permutation(0)
|
2004-11-12 04:01:46 +01:00
|
|
|
{
|
|
|
|
DBUG_ENTER("Format_description_log_event::Format_description_log_event(char*,...)");
|
|
|
|
buf+= LOG_EVENT_MINIMAL_HEADER_LEN;
|
|
|
|
if ((common_header_len=buf[ST_COMMON_HEADER_LEN_OFFSET]) < OLD_HEADER_LEN)
|
|
|
|
DBUG_VOID_RETURN; /* sanity check */
|
|
|
|
number_of_event_types=
|
|
|
|
event_len-(LOG_EVENT_MINIMAL_HEADER_LEN+ST_COMMON_HEADER_LEN_OFFSET+1);
|
|
|
|
DBUG_PRINT("info", ("common_header_len=%d number_of_event_types=%d",
|
2005-02-17 13:52:16 +01:00
|
|
|
common_header_len, number_of_event_types));
|
2004-11-12 04:01:46 +01:00
|
|
|
/* If alloc fails, we'll detect it in is_valid() */
|
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
|
|
|
post_header_len= (uint8*) my_memdup((uchar*)buf+ST_COMMON_HEADER_LEN_OFFSET+1,
|
2004-11-12 04:01:46 +01:00
|
|
|
number_of_event_types*
|
2005-01-16 13:16:23 +01:00
|
|
|
sizeof(*post_header_len), MYF(0));
|
Fix for BUG#24432
"INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values".
When in an INSERT ON DUPLICATE KEY UPDATE, using
an autoincrement column, we inserted some autogenerated values and
also updated some rows, some autogenerated values were not used
(for example, even if 10 was the largest autoinc value in the table
at the start of the statement, 12 could be the first autogenerated
value inserted by the statement, instead of 11). One autogenerated
value was lost per updated row. Led to exhausting the range of the
autoincrement column faster.
Bug introduced by fix of BUG#20188; present since 5.0.24 and 5.1.12.
This bug breaks replication from a pre-5.0.24 master.
But the present bugfix, as it makes INSERT ON DUP KEY UPDATE
behave like pre-5.0.24, breaks replication from a [5.0.24,5.0.34]
master to a fixed (5.0.36) slave! To warn users against this when
they upgrade their slave, as agreed with the support team, we add
code for a fixed slave to detect that it is connected to a buggy
master in a situation (INSERT ON DUP KEY UPDATE into autoinc column)
likely to break replication, in which case it cannot replicate so
stops and prints a message to the slave's error log and to SHOW SLAVE
STATUS.
For 5.0.36->[5.0.24,5.0.34] replication we cannot warn as master
does not know the slave's version (but we always recommended to users
to have slave at least as new as master).
As agreed with support, I'll also ask for an alert to be put into
the MySQL Network Monitoring and Advisory Service.
2007-02-08 15:53:14 +01:00
|
|
|
calc_server_version_split();
|
2008-01-10 16:39:44 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
In some previous versions, the events were given other event type
|
|
|
|
id numbers than in the present version. When replicating from such
|
|
|
|
a version, we therefore set up an array that maps those id numbers
|
|
|
|
to the id numbers of the present server.
|
|
|
|
|
|
|
|
If post_header_len is null, it means malloc failed, and is_valid
|
|
|
|
will fail, so there is no need to do anything.
|
|
|
|
|
2008-01-29 14:47:26 +01:00
|
|
|
The trees in which events have wrong id's are:
|
|
|
|
|
|
|
|
mysql-5.1-wl1012.old mysql-5.1-wl2325-5.0-drop6p13-alpha
|
|
|
|
mysql-5.1-wl2325-5.0-drop6 mysql-5.1-wl2325-5.0
|
|
|
|
mysql-5.1-wl2325-no-dd
|
|
|
|
|
|
|
|
(this was found by grepping for two lines in sequence where the
|
|
|
|
first matches "FORMAT_DESCRIPTION_EVENT," and the second matches
|
|
|
|
"TABLE_MAP_EVENT," in log_event.h in all trees)
|
|
|
|
|
|
|
|
In these trees, the following server_versions existed since
|
|
|
|
TABLE_MAP_EVENT was introduced:
|
|
|
|
|
|
|
|
5.1.1-a_drop5p3 5.1.1-a_drop5p4 5.1.1-alpha
|
|
|
|
5.1.2-a_drop5p10 5.1.2-a_drop5p11 5.1.2-a_drop5p12
|
|
|
|
5.1.2-a_drop5p13 5.1.2-a_drop5p14 5.1.2-a_drop5p15
|
|
|
|
5.1.2-a_drop5p16 5.1.2-a_drop5p16b 5.1.2-a_drop5p16c
|
|
|
|
5.1.2-a_drop5p17 5.1.2-a_drop5p4 5.1.2-a_drop5p5
|
|
|
|
5.1.2-a_drop5p6 5.1.2-a_drop5p7 5.1.2-a_drop5p8
|
|
|
|
5.1.2-a_drop5p9 5.1.3-a_drop5p17 5.1.3-a_drop5p17b
|
|
|
|
5.1.3-a_drop5p17c 5.1.4-a_drop5p18 5.1.4-a_drop5p19
|
|
|
|
5.1.4-a_drop5p20 5.1.4-a_drop6p0 5.1.4-a_drop6p1
|
|
|
|
5.1.4-a_drop6p2 5.1.5-a_drop5p20 5.2.0-a_drop6p3
|
|
|
|
5.2.0-a_drop6p4 5.2.0-a_drop6p5 5.2.0-a_drop6p6
|
|
|
|
5.2.1-a_drop6p10 5.2.1-a_drop6p11 5.2.1-a_drop6p12
|
|
|
|
5.2.1-a_drop6p6 5.2.1-a_drop6p7 5.2.1-a_drop6p8
|
|
|
|
5.2.2-a_drop6p13 5.2.2-a_drop6p13-alpha 5.2.2-a_drop6p13b
|
|
|
|
5.2.2-a_drop6p13c
|
|
|
|
|
|
|
|
(this was found by grepping for "mysql," in all historical
|
|
|
|
versions of configure.in in the trees listed above).
|
|
|
|
|
|
|
|
There are 5.1.1-alpha versions that use the new event id's, so we
|
|
|
|
do not test that version string. So replication from 5.1.1-alpha
|
|
|
|
with the other event id's to a new version does not work.
|
|
|
|
Moreover, we can safely ignore the part after drop[56]. This
|
|
|
|
allows us to simplify the big list above to the following regexes:
|
|
|
|
|
|
|
|
5\.1\.[1-5]-a_drop5.*
|
|
|
|
5\.1\.4-a_drop6.*
|
|
|
|
5\.2\.[0-2]-a_drop6.*
|
|
|
|
|
|
|
|
This is what we test for in the 'if' below.
|
2008-01-10 16:39:44 +01:00
|
|
|
*/
|
|
|
|
if (post_header_len &&
|
2008-01-29 14:47:26 +01:00
|
|
|
server_version[0] == '5' && server_version[1] == '.' &&
|
|
|
|
server_version[3] == '.' &&
|
|
|
|
strncmp(server_version + 5, "-a_drop", 7) == 0 &&
|
|
|
|
((server_version[2] == '1' &&
|
|
|
|
server_version[4] >= '1' && server_version[4] <= '5' &&
|
|
|
|
server_version[12] == '5') ||
|
|
|
|
(server_version[2] == '1' &&
|
|
|
|
server_version[4] == '4' &&
|
|
|
|
server_version[12] == '6') ||
|
|
|
|
(server_version[2] == '2' &&
|
|
|
|
server_version[4] >= '0' && server_version[4] <= '2' &&
|
|
|
|
server_version[12] == '6')))
|
2008-01-10 16:39:44 +01:00
|
|
|
{
|
|
|
|
if (number_of_event_types != 22)
|
|
|
|
{
|
|
|
|
DBUG_PRINT("info", (" number_of_event_types=%d",
|
|
|
|
number_of_event_types));
|
|
|
|
/* this makes is_valid() return false. */
|
|
|
|
my_free(post_header_len, MYF(MY_ALLOW_ZERO_PTR));
|
|
|
|
post_header_len= NULL;
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
static const uint8 perm[23]=
|
|
|
|
{
|
|
|
|
UNKNOWN_EVENT, START_EVENT_V3, QUERY_EVENT, STOP_EVENT, ROTATE_EVENT,
|
|
|
|
INTVAR_EVENT, LOAD_EVENT, SLAVE_EVENT, CREATE_FILE_EVENT,
|
|
|
|
APPEND_BLOCK_EVENT, EXEC_LOAD_EVENT, DELETE_FILE_EVENT,
|
|
|
|
NEW_LOAD_EVENT,
|
|
|
|
RAND_EVENT, USER_VAR_EVENT,
|
|
|
|
FORMAT_DESCRIPTION_EVENT,
|
|
|
|
TABLE_MAP_EVENT,
|
|
|
|
PRE_GA_WRITE_ROWS_EVENT,
|
|
|
|
PRE_GA_UPDATE_ROWS_EVENT,
|
|
|
|
PRE_GA_DELETE_ROWS_EVENT,
|
|
|
|
XID_EVENT,
|
|
|
|
BEGIN_LOAD_QUERY_EVENT,
|
|
|
|
EXECUTE_LOAD_QUERY_EVENT,
|
|
|
|
};
|
|
|
|
event_type_permutation= perm;
|
|
|
|
/*
|
|
|
|
Since we use (permuted) event id's to index the post_header_len
|
|
|
|
array, we need to permute the post_header_len array too.
|
|
|
|
*/
|
|
|
|
uint8 post_header_len_temp[23];
|
|
|
|
for (int i= 1; i < 23; i++)
|
|
|
|
post_header_len_temp[perm[i] - 1]= post_header_len[i - 1];
|
|
|
|
for (int i= 0; i < 22; i++)
|
|
|
|
post_header_len[i] = post_header_len_temp[i];
|
|
|
|
}
|
2004-11-12 04:01:46 +01:00
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
2005-03-22 00:26:12 +01:00
|
|
|
#ifndef MYSQL_CLIENT
|
2004-11-12 04:01:46 +01:00
|
|
|
bool Format_description_log_event::write(IO_CACHE* file)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
We don't call Start_log_event_v3::write() because this would make 2
|
|
|
|
my_b_safe_write().
|
|
|
|
*/
|
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 buff[FORMAT_DESCRIPTION_HEADER_LEN];
|
2004-11-12 04:01:46 +01:00
|
|
|
int2store(buff + ST_BINLOG_VER_OFFSET,binlog_version);
|
|
|
|
memcpy((char*) buff + ST_SERVER_VER_OFFSET,server_version,ST_SERVER_VER_LEN);
|
2007-08-14 14:20:05 +02:00
|
|
|
if (!dont_set_created)
|
|
|
|
created= when= get_time();
|
2004-11-12 04:01:46 +01:00
|
|
|
int4store(buff + ST_CREATED_OFFSET,created);
|
2005-02-17 13:52:16 +01:00
|
|
|
buff[ST_COMMON_HEADER_LEN_OFFSET]= LOG_EVENT_HEADER_LEN;
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
memcpy((char*) buff+ST_COMMON_HEADER_LEN_OFFSET+1, (uchar*) post_header_len,
|
2004-11-12 04:01:46 +01:00
|
|
|
LOG_EVENT_TYPES);
|
|
|
|
return (write_header(file, sizeof(buff)) ||
|
|
|
|
my_b_safe_write(file, buff, sizeof(buff)));
|
|
|
|
}
|
2005-03-22 00:26:12 +01:00
|
|
|
#endif
|
2005-02-17 13:52:16 +01:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2007-08-16 07:37:50 +02:00
|
|
|
int Format_description_log_event::do_apply_event(Relay_log_info const *rli)
|
2004-11-12 04:01:46 +01:00
|
|
|
{
|
2006-11-10 15:10:41 +01:00
|
|
|
DBUG_ENTER("Format_description_log_event::do_apply_event");
|
2004-11-12 04:01:46 +01:00
|
|
|
|
2005-03-16 23:47:38 +01:00
|
|
|
#ifdef USING_TRANSACTIONS
|
2005-02-17 13:52:16 +01:00
|
|
|
/*
|
|
|
|
As a transaction NEVER spans on 2 or more binlogs:
|
|
|
|
if we have an active transaction at this point, the master died
|
|
|
|
while writing the transaction to the binary log, i.e. while
|
2005-12-22 06:39:02 +01:00
|
|
|
flushing the binlog cache to the binlog. XA guarantees that master has
|
|
|
|
rolled back. So we roll back.
|
2005-02-17 13:52:16 +01:00
|
|
|
Note: this event could be sent by the master to inform us of the
|
|
|
|
format of its binlog; in other words maybe it is not at its
|
|
|
|
original place when it comes to us; we'll know this by checking
|
|
|
|
log_pos ("artificial" events have log_pos == 0).
|
|
|
|
*/
|
2008-09-28 09:34:25 +02:00
|
|
|
if (!is_artificial_event() && created && thd->transaction.all.ha_list)
|
2005-02-17 13:52:16 +01:00
|
|
|
{
|
2005-12-22 06:39:02 +01:00
|
|
|
/* This is not an error (XA is safe), just an information */
|
2007-06-09 07:19:37 +02:00
|
|
|
rli->report(INFORMATION_LEVEL, 0,
|
|
|
|
"Rolling back unfinished transaction (no COMMIT "
|
|
|
|
"or ROLLBACK in relay log). A probable cause is that "
|
|
|
|
"the master died while writing the transaction to "
|
|
|
|
"its binary log, thus rolled back too.");
|
2007-08-16 07:37:50 +02:00
|
|
|
const_cast<Relay_log_info*>(rli)->cleanup_context(thd, 1);
|
2005-02-17 13:52:16 +01:00
|
|
|
}
|
2005-03-16 23:47:38 +01:00
|
|
|
#endif
|
2004-11-12 04:01:46 +01:00
|
|
|
/*
|
2006-11-01 15:35:37 +01:00
|
|
|
If this event comes from ourselves, there is no cleaning task to
|
2006-11-10 15:10:41 +01:00
|
|
|
perform, we don't call Start_log_event_v3::do_apply_event()
|
2006-11-01 15:35:37 +01:00
|
|
|
(this was just to update the log's description event).
|
2004-11-12 04:01:46 +01:00
|
|
|
*/
|
2006-11-10 15:10:41 +01:00
|
|
|
if (server_id != (uint32) ::server_id)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
If the event was not requested by the slave i.e. the master sent
|
|
|
|
it while the slave asked for a position >4, the event will make
|
|
|
|
rli->group_master_log_pos advance. Say that the slave asked for
|
|
|
|
position 1000, and the Format_desc event's end is 96. Then in
|
|
|
|
the beginning of replication rli->group_master_log_pos will be
|
|
|
|
0, then 96, then jump to first really asked event (which is
|
|
|
|
>96). So this is ok.
|
|
|
|
*/
|
|
|
|
DBUG_RETURN(Start_log_event_v3::do_apply_event(rli));
|
|
|
|
}
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
int Format_description_log_event::do_update_pos(Relay_log_info *rli)
|
2006-11-10 15:10:41 +01:00
|
|
|
{
|
|
|
|
/* save the information describing this binlog */
|
|
|
|
delete rli->relay_log.description_event_for_exec;
|
|
|
|
rli->relay_log.description_event_for_exec= this;
|
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
if (server_id == (uint32) ::server_id)
|
|
|
|
{
|
|
|
|
/*
|
2006-10-10 15:18:21 +02:00
|
|
|
We only increase the relay log position if we are skipping
|
|
|
|
events and do not touch any group_* variables, nor flush the
|
|
|
|
relay log info. If there is a crash, we will have to re-skip
|
|
|
|
the events again, but that is a minor issue.
|
|
|
|
|
|
|
|
If we do not skip stepping the group log position (and the
|
|
|
|
server id was changed when restarting the server), it might well
|
|
|
|
be that we start executing at a position that is invalid, e.g.,
|
|
|
|
at a Rows_log_event or a Query_log_event preceeded by a
|
|
|
|
Intvar_log_event instead of starting at a Table_map_log_event or
|
|
|
|
the Intvar_log_event respectively.
|
|
|
|
*/
|
|
|
|
rli->inc_event_relay_log_pos();
|
2006-11-10 15:10:41 +01:00
|
|
|
return 0;
|
2004-11-12 04:01:46 +01:00
|
|
|
}
|
2006-11-10 15:10:41 +01:00
|
|
|
else
|
|
|
|
{
|
|
|
|
return Log_event::do_update_pos(rli);
|
2004-11-12 04:01:46 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-01-17 15:06:37 +01:00
|
|
|
Log_event::enum_skip_reason
|
2007-08-16 07:37:50 +02:00
|
|
|
Format_description_log_event::do_shall_skip(Relay_log_info *rli)
|
2007-01-17 15:06:37 +01:00
|
|
|
{
|
2007-03-22 08:32:41 +01:00
|
|
|
return Log_event::EVENT_SKIP_NOT;
|
2004-11-12 04:01:46 +01:00
|
|
|
}
|
2007-01-17 15:06:37 +01:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
#endif
|
|
|
|
|
Fix for BUG#24432
"INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values".
When in an INSERT ON DUPLICATE KEY UPDATE, using
an autoincrement column, we inserted some autogenerated values and
also updated some rows, some autogenerated values were not used
(for example, even if 10 was the largest autoinc value in the table
at the start of the statement, 12 could be the first autogenerated
value inserted by the statement, instead of 11). One autogenerated
value was lost per updated row. Led to exhausting the range of the
autoincrement column faster.
Bug introduced by fix of BUG#20188; present since 5.0.24 and 5.1.12.
This bug breaks replication from a pre-5.0.24 master.
But the present bugfix, as it makes INSERT ON DUP KEY UPDATE
behave like pre-5.0.24, breaks replication from a [5.0.24,5.0.34]
master to a fixed (5.0.36) slave! To warn users against this when
they upgrade their slave, as agreed with the support team, we add
code for a fixed slave to detect that it is connected to a buggy
master in a situation (INSERT ON DUP KEY UPDATE into autoinc column)
likely to break replication, in which case it cannot replicate so
stops and prints a message to the slave's error log and to SHOW SLAVE
STATUS.
For 5.0.36->[5.0.24,5.0.34] replication we cannot warn as master
does not know the slave's version (but we always recommended to users
to have slave at least as new as master).
As agreed with support, I'll also ask for an alert to be put into
the MySQL Network Monitoring and Advisory Service.
2007-02-08 15:53:14 +01:00
|
|
|
|
|
|
|
/**
|
|
|
|
Splits the event's 'server_version' string into three numeric pieces stored
|
|
|
|
into 'server_version_split':
|
|
|
|
X.Y.Zabc (X,Y,Z numbers, a not a digit) -> {X,Y,Z}
|
|
|
|
X.Yabc -> {X,Y,0}
|
|
|
|
Xabc -> {X,0,0}
|
|
|
|
'server_version_split' is then used for lookups to find if the server which
|
|
|
|
created this event has some known bug.
|
|
|
|
*/
|
|
|
|
void Format_description_log_event::calc_server_version_split()
|
|
|
|
{
|
|
|
|
char *p= server_version, *r;
|
|
|
|
ulong number;
|
|
|
|
for (uint i= 0; i<=2; i++)
|
|
|
|
{
|
|
|
|
number= strtoul(p, &r, 10);
|
|
|
|
server_version_split[i]= (uchar)number;
|
|
|
|
DBUG_ASSERT(number < 256); // fit in uchar
|
|
|
|
p= r;
|
|
|
|
DBUG_ASSERT(!((i == 0) && (*r != '.'))); // should be true in practice
|
|
|
|
if (*r == '.')
|
|
|
|
p++; // skip the dot
|
|
|
|
}
|
|
|
|
DBUG_PRINT("info",("Format_description_log_event::server_version_split:"
|
|
|
|
" '%s' %d %d %d", server_version,
|
|
|
|
server_version_split[0],
|
|
|
|
server_version_split[1], server_version_split[2]));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
/**************************************************************************
|
2005-02-17 13:52:16 +01:00
|
|
|
Load_log_event methods
|
2004-11-12 04:01:46 +01:00
|
|
|
General note about Load_log_event: the binlogging of LOAD DATA INFILE is
|
2005-02-09 20:04:28 +01:00
|
|
|
going to be changed in 5.0 (or maybe in 5.1; not decided yet).
|
2004-11-12 04:01:46 +01:00
|
|
|
However, the 5.0 slave could still have to read such events (from a 4.x
|
|
|
|
master), convert them (which just means maybe expand the header, when 5.0
|
|
|
|
servers have a UID in events) (remember that whatever is after the header
|
|
|
|
will be like in 4.x, as this event's format is not modified in 5.0 as we
|
|
|
|
will use new types of events to log the new LOAD DATA INFILE features).
|
|
|
|
To be able to read/convert, we just need to not assume that the common
|
|
|
|
header is of length LOG_EVENT_HEADER_LEN (we must use the description
|
|
|
|
event).
|
|
|
|
Note that I (Guilhem) manually tested replication of a big LOAD DATA INFILE
|
|
|
|
between 3.23 and 5.0, and between 4.0 and 5.0, and it works fine (and the
|
|
|
|
positions displayed in SHOW SLAVE STATUS then are fine too).
|
|
|
|
**************************************************************************/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Load_log_event::pack_info()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2005-03-16 02:32:47 +01:00
|
|
|
uint Load_log_event::get_query_buffer_length()
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
2005-03-16 02:32:47 +01:00
|
|
|
return
|
2003-01-17 13:39:29 +01:00
|
|
|
5 + db_len + 3 + // "use DB; "
|
|
|
|
18 + fname_len + 2 + // "LOAD DATA INFILE 'file''"
|
2003-08-11 21:44:43 +02:00
|
|
|
7 + // LOCAL
|
2003-01-17 13:39:29 +01:00
|
|
|
9 + // " REPLACE or IGNORE "
|
2004-02-16 09:15:52 +01:00
|
|
|
13 + table_name_len*2 + // "INTO TABLE `table`"
|
2003-01-17 13:39:29 +01:00
|
|
|
21 + sql_ex.field_term_len*4 + 2 + // " FIELDS TERMINATED BY 'str'"
|
|
|
|
23 + sql_ex.enclosed_len*4 + 2 + // " OPTIONALLY ENCLOSED BY 'str'"
|
|
|
|
12 + sql_ex.escaped_len*4 + 2 + // " ESCAPED BY 'str'"
|
2007-10-25 11:58:18 +02:00
|
|
|
21 + sql_ex.line_term_len*4 + 2 + // " LINES TERMINATED BY 'str'"
|
2005-02-17 13:52:16 +01:00
|
|
|
19 + sql_ex.line_start_len*4 + 2 + // " LINES STARTING BY 'str'"
|
|
|
|
15 + 22 + // " IGNORE xxx LINES"
|
2003-01-17 13:39:29 +01:00
|
|
|
3 + (num_fields-1)*2 + field_block_len; // " (field1, field2, ...)"
|
2005-03-16 02:32:47 +01:00
|
|
|
}
|
2003-01-17 13:39:29 +01:00
|
|
|
|
2005-03-16 02:32:47 +01:00
|
|
|
|
|
|
|
void Load_log_event::print_query(bool need_db, char *buf,
|
|
|
|
char **end, char **fn_start, char **fn_end)
|
|
|
|
{
|
|
|
|
char *pos= buf;
|
|
|
|
|
|
|
|
if (need_db && db && db_len)
|
2001-08-19 04:22:20 +02:00
|
|
|
{
|
2003-01-17 13:39:29 +01:00
|
|
|
pos= strmov(pos, "use `");
|
|
|
|
memcpy(pos, db, db_len);
|
2003-08-11 21:44:43 +02:00
|
|
|
pos= strmov(pos+db_len, "`; ");
|
2001-08-19 04:22:20 +02:00
|
|
|
}
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-08-11 21:44:43 +02:00
|
|
|
pos= strmov(pos, "LOAD DATA ");
|
2005-03-16 02:32:47 +01:00
|
|
|
|
|
|
|
if (fn_start)
|
|
|
|
*fn_start= pos;
|
|
|
|
|
2003-08-11 21:44:43 +02:00
|
|
|
if (check_fname_outside_temp_buf())
|
|
|
|
pos= strmov(pos, "LOCAL ");
|
|
|
|
pos= strmov(pos, "INFILE '");
|
2003-01-17 13:39:29 +01:00
|
|
|
memcpy(pos, fname, fname_len);
|
2003-08-11 21:44:43 +02:00
|
|
|
pos= strmov(pos+fname_len, "' ");
|
2003-01-17 13:39:29 +01:00
|
|
|
|
2003-04-03 20:19:12 +02:00
|
|
|
if (sql_ex.opt_flags & REPLACE_FLAG)
|
2003-01-17 13:39:29 +01:00
|
|
|
pos= strmov(pos, " REPLACE ");
|
2003-04-03 20:19:12 +02:00
|
|
|
else if (sql_ex.opt_flags & IGNORE_FLAG)
|
2003-01-17 13:39:29 +01:00
|
|
|
pos= strmov(pos, " IGNORE ");
|
|
|
|
|
2005-03-16 02:32:47 +01:00
|
|
|
pos= strmov(pos ,"INTO");
|
|
|
|
|
|
|
|
if (fn_end)
|
|
|
|
*fn_end= pos;
|
|
|
|
|
|
|
|
pos= strmov(pos ," TABLE `");
|
2003-01-17 13:39:29 +01:00
|
|
|
memcpy(pos, table_name, table_name_len);
|
|
|
|
pos+= table_name_len;
|
|
|
|
|
2004-02-16 09:03:25 +01:00
|
|
|
/* We have to create all optinal fields as the default is not empty */
|
2004-02-16 09:15:52 +01:00
|
|
|
pos= strmov(pos, "` FIELDS TERMINATED BY ");
|
2004-02-16 09:03:25 +01:00
|
|
|
pos= pretty_print_str(pos, sql_ex.field_term, sql_ex.field_term_len);
|
|
|
|
if (sql_ex.opt_flags & OPT_ENCLOSED_FLAG)
|
|
|
|
pos= strmov(pos, " OPTIONALLY ");
|
|
|
|
pos= strmov(pos, " ENCLOSED BY ");
|
|
|
|
pos= pretty_print_str(pos, sql_ex.enclosed, sql_ex.enclosed_len);
|
2003-01-17 13:39:29 +01:00
|
|
|
|
2004-02-16 09:03:25 +01:00
|
|
|
pos= strmov(pos, " ESCAPED BY ");
|
|
|
|
pos= pretty_print_str(pos, sql_ex.escaped, sql_ex.escaped_len);
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2004-02-16 09:03:25 +01:00
|
|
|
pos= strmov(pos, " LINES TERMINATED BY ");
|
|
|
|
pos= pretty_print_str(pos, sql_ex.line_term, sql_ex.line_term_len);
|
2002-10-30 07:50:07 +01:00
|
|
|
if (sql_ex.line_start_len)
|
|
|
|
{
|
2003-05-20 23:03:18 +02:00
|
|
|
pos= strmov(pos, " STARTING BY ");
|
2003-01-17 13:39:29 +01:00
|
|
|
pos= pretty_print_str(pos, sql_ex.line_start, sql_ex.line_start_len);
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
2003-01-17 13:39:29 +01:00
|
|
|
|
2003-08-11 21:44:43 +02:00
|
|
|
if ((long) skip_lines > 0)
|
2003-01-17 13:39:29 +01:00
|
|
|
{
|
|
|
|
pos= strmov(pos, " IGNORE ");
|
2003-08-11 21:44:43 +02:00
|
|
|
pos= longlong10_to_str((longlong) skip_lines, pos, 10);
|
2003-01-17 13:39:29 +01:00
|
|
|
pos= strmov(pos," LINES ");
|
|
|
|
}
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
if (num_fields)
|
|
|
|
{
|
|
|
|
uint i;
|
2003-08-11 21:44:43 +02:00
|
|
|
const char *field= fields;
|
2003-01-17 13:39:29 +01:00
|
|
|
pos= strmov(pos, " (");
|
2002-10-30 07:50:07 +01:00
|
|
|
for (i = 0; i < num_fields; i++)
|
|
|
|
{
|
|
|
|
if (i)
|
2003-08-11 21:44:43 +02:00
|
|
|
{
|
|
|
|
*pos++= ' ';
|
|
|
|
*pos++= ',';
|
|
|
|
}
|
2003-01-17 13:39:29 +01:00
|
|
|
memcpy(pos, field, field_lens[i]);
|
2003-08-11 21:44:43 +02:00
|
|
|
pos+= field_lens[i];
|
|
|
|
field+= field_lens[i] + 1;
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
2003-01-17 13:39:29 +01:00
|
|
|
*pos++= ')';
|
2001-08-19 04:22:20 +02:00
|
|
|
}
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2005-03-16 02:32:47 +01:00
|
|
|
*end= pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Load_log_event::pack_info(Protocol *protocol)
|
|
|
|
{
|
|
|
|
char *buf, *end;
|
|
|
|
|
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 (!(buf= (char*) my_malloc(get_query_buffer_length(), MYF(MY_WME))))
|
2005-03-16 02:32:47 +01:00
|
|
|
return;
|
|
|
|
print_query(TRUE, buf, &end, 0, 0);
|
|
|
|
protocol->store(buf, end-buf, &my_charset_bin);
|
2003-08-11 21:44:43 +02:00
|
|
|
my_free(buf, MYF(0));
|
2001-08-19 04:22:20 +02:00
|
|
|
}
|
2003-05-19 15:35:49 +02:00
|
|
|
#endif /* defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) */
|
2001-08-19 04:22:20 +02:00
|
|
|
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2005-03-22 00:26:12 +01:00
|
|
|
#ifndef MYSQL_CLIENT
|
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Load_log_event::write_data_header()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
bool Load_log_event::write_data_header(IO_CACHE* file)
|
2001-09-21 02:38:35 +02:00
|
|
|
{
|
2002-10-30 07:50:07 +01:00
|
|
|
char buf[LOAD_HEADER_LEN];
|
2003-11-04 08:40:36 +01:00
|
|
|
int4store(buf + L_THREAD_ID_OFFSET, slave_proxy_id);
|
2002-10-30 07:50:07 +01:00
|
|
|
int4store(buf + L_EXEC_TIME_OFFSET, exec_time);
|
|
|
|
int4store(buf + L_SKIP_LINES_OFFSET, skip_lines);
|
|
|
|
buf[L_TBL_LEN_OFFSET] = (char)table_name_len;
|
|
|
|
buf[L_DB_LEN_OFFSET] = (char)db_len;
|
|
|
|
int4store(buf + L_NUM_FIELDS_OFFSET, num_fields);
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
return my_b_safe_write(file, (uchar*)buf, LOAD_HEADER_LEN) != 0;
|
2001-09-21 02:38:35 +02:00
|
|
|
}
|
2001-08-19 04:22:20 +02:00
|
|
|
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Load_log_event::write_data_body()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
bool Load_log_event::write_data_body(IO_CACHE* file)
|
2001-08-19 04:22:20 +02:00
|
|
|
{
|
2002-10-30 07:50:07 +01:00
|
|
|
if (sql_ex.write_data(file))
|
|
|
|
return 1;
|
|
|
|
if (num_fields && fields && field_lens)
|
2001-08-19 04:22:20 +02:00
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (my_b_safe_write(file, (uchar*)field_lens, num_fields) ||
|
|
|
|
my_b_safe_write(file, (uchar*)fields, field_block_len))
|
2002-10-30 07:50:07 +01:00
|
|
|
return 1;
|
2001-08-19 04:22:20 +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
|
|
|
return (my_b_safe_write(file, (uchar*)table_name, table_name_len + 1) ||
|
|
|
|
my_b_safe_write(file, (uchar*)db, db_len + 1) ||
|
|
|
|
my_b_safe_write(file, (uchar*)fname, fname_len));
|
2001-08-19 04:22:20 +02:00
|
|
|
}
|
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Load_log_event::Load_log_event()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2001-08-19 04:22:20 +02:00
|
|
|
|
2002-11-21 14:56:48 +01:00
|
|
|
Load_log_event::Load_log_event(THD *thd_arg, sql_exchange *ex,
|
|
|
|
const char *db_arg, const char *table_name_arg,
|
|
|
|
List<Item> &fields_arg,
|
2002-11-21 21:25:53 +01:00
|
|
|
enum enum_duplicates handle_dup,
|
2004-12-31 11:04:35 +01:00
|
|
|
bool ignore, bool using_trans)
|
2007-08-01 12:27:03 +02:00
|
|
|
:Log_event(thd_arg,
|
2007-08-01 16:20:25 +02:00
|
|
|
thd_arg->thread_specific_used ? LOG_EVENT_THREAD_SPECIFIC_F : 0,
|
2007-08-01 12:27:03 +02:00
|
|
|
using_trans),
|
2004-12-03 23:07:08 +01:00
|
|
|
thread_id(thd_arg->thread_id),
|
2003-11-04 13:09:03 +01:00
|
|
|
slave_proxy_id(thd_arg->variables.pseudo_thread_id),
|
2003-10-29 14:23:35 +01:00
|
|
|
num_fields(0),fields(0),
|
|
|
|
field_lens(0),field_block_len(0),
|
2002-11-21 21:25:53 +01:00
|
|
|
table_name(table_name_arg ? table_name_arg : ""),
|
2004-02-06 17:57:11 +01:00
|
|
|
db(db_arg), fname(ex->file_name), local_fname(FALSE)
|
2002-06-05 22:04:38 +02:00
|
|
|
{
|
|
|
|
time_t end_time;
|
|
|
|
time(&end_time);
|
2002-11-07 02:54:00 +01:00
|
|
|
exec_time = (ulong) (end_time - thd_arg->start_time);
|
2002-06-29 19:26:33 +02:00
|
|
|
/* db can never be a zero pointer in 4.0 */
|
|
|
|
db_len = (uint32) strlen(db);
|
|
|
|
table_name_len = (uint32) strlen(table_name);
|
2002-06-05 22:04:38 +02:00
|
|
|
fname_len = (fname) ? (uint) strlen(fname) : 0;
|
|
|
|
sql_ex.field_term = (char*) ex->field_term->ptr();
|
|
|
|
sql_ex.field_term_len = (uint8) ex->field_term->length();
|
|
|
|
sql_ex.enclosed = (char*) ex->enclosed->ptr();
|
|
|
|
sql_ex.enclosed_len = (uint8) ex->enclosed->length();
|
|
|
|
sql_ex.line_term = (char*) ex->line_term->ptr();
|
|
|
|
sql_ex.line_term_len = (uint8) ex->line_term->length();
|
|
|
|
sql_ex.line_start = (char*) ex->line_start->ptr();
|
|
|
|
sql_ex.line_start_len = (uint8) ex->line_start->length();
|
|
|
|
sql_ex.escaped = (char*) ex->escaped->ptr();
|
|
|
|
sql_ex.escaped_len = (uint8) ex->escaped->length();
|
|
|
|
sql_ex.opt_flags = 0;
|
|
|
|
sql_ex.cached_new_format = -1;
|
2001-08-19 04:22:20 +02:00
|
|
|
|
2002-06-05 22:04:38 +02:00
|
|
|
if (ex->dumpfile)
|
2003-04-03 20:19:11 +02:00
|
|
|
sql_ex.opt_flags|= DUMPFILE_FLAG;
|
2002-06-05 22:04:38 +02:00
|
|
|
if (ex->opt_enclosed)
|
2003-04-03 20:19:11 +02:00
|
|
|
sql_ex.opt_flags|= OPT_ENCLOSED_FLAG;
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2003-04-03 20:19:12 +02:00
|
|
|
sql_ex.empty_flags= 0;
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2002-06-11 10:20:31 +02:00
|
|
|
switch (handle_dup) {
|
2002-12-06 20:11:27 +01:00
|
|
|
case DUP_REPLACE:
|
2003-04-03 20:19:12 +02:00
|
|
|
sql_ex.opt_flags|= REPLACE_FLAG;
|
2002-12-06 20:11:27 +01:00
|
|
|
break;
|
|
|
|
case DUP_UPDATE: // Impossible here
|
|
|
|
case DUP_ERROR:
|
|
|
|
break;
|
2002-06-05 22:04:38 +02:00
|
|
|
}
|
2004-12-31 11:04:35 +01:00
|
|
|
if (ignore)
|
|
|
|
sql_ex.opt_flags|= IGNORE_FLAG;
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2002-06-05 22:04:38 +02:00
|
|
|
if (!ex->field_term->length())
|
|
|
|
sql_ex.empty_flags |= FIELD_TERM_EMPTY;
|
|
|
|
if (!ex->enclosed->length())
|
|
|
|
sql_ex.empty_flags |= ENCLOSED_EMPTY;
|
|
|
|
if (!ex->line_term->length())
|
|
|
|
sql_ex.empty_flags |= LINE_TERM_EMPTY;
|
|
|
|
if (!ex->line_start->length())
|
|
|
|
sql_ex.empty_flags |= LINE_START_EMPTY;
|
|
|
|
if (!ex->escaped->length())
|
|
|
|
sql_ex.empty_flags |= ESCAPED_EMPTY;
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2002-06-05 22:04:38 +02:00
|
|
|
skip_lines = ex->skip_lines;
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2002-06-05 22:04:38 +02:00
|
|
|
List_iterator<Item> li(fields_arg);
|
|
|
|
field_lens_buf.length(0);
|
|
|
|
fields_buf.length(0);
|
|
|
|
Item* item;
|
|
|
|
while ((item = li++))
|
|
|
|
{
|
|
|
|
num_fields++;
|
|
|
|
uchar len = (uchar) strlen(item->name);
|
|
|
|
field_block_len += len + 1;
|
|
|
|
fields_buf.append(item->name, len + 1);
|
|
|
|
field_lens_buf.append((char*)&len, 1);
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
|
|
|
|
2002-06-05 22:04:38 +02:00
|
|
|
field_lens = (const uchar*)field_lens_buf.ptr();
|
|
|
|
fields = fields_buf.ptr();
|
|
|
|
}
|
2003-05-19 15:35:49 +02:00
|
|
|
#endif /* !MYSQL_CLIENT */
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
@note
|
2003-05-19 15:35:49 +02:00
|
|
|
The caller must do buf[event_len] = 0 before he starts using the
|
|
|
|
constructed event.
|
2002-06-11 10:20:31 +02:00
|
|
|
*/
|
2004-11-12 04:01:46 +01:00
|
|
|
Load_log_event::Load_log_event(const char *buf, uint event_len,
|
|
|
|
const Format_description_log_event *description_event)
|
|
|
|
:Log_event(buf, description_event), num_fields(0), fields(0),
|
|
|
|
field_lens(0),field_block_len(0),
|
2004-02-11 00:06:46 +01:00
|
|
|
table_name(0), db(0), fname(0), local_fname(FALSE)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2004-02-16 09:03:25 +01:00
|
|
|
DBUG_ENTER("Load_log_event");
|
2004-11-12 04:01:46 +01:00
|
|
|
/*
|
|
|
|
I (Guilhem) manually tested replication of LOAD DATA INFILE for 3.23->5.0,
|
|
|
|
4.0->5.0 and 5.0->5.0 and it works.
|
|
|
|
*/
|
|
|
|
if (event_len)
|
|
|
|
copy_log_event(buf, event_len,
|
|
|
|
((buf[EVENT_TYPE_OFFSET] == LOAD_EVENT) ?
|
|
|
|
LOAD_HEADER_LEN +
|
|
|
|
description_event->common_header_len :
|
|
|
|
LOAD_HEADER_LEN + LOG_EVENT_HEADER_LEN),
|
|
|
|
description_event);
|
|
|
|
/* otherwise it's a derived class, will call copy_log_event() itself */
|
2004-02-16 09:03:25 +01:00
|
|
|
DBUG_VOID_RETURN;
|
2000-11-15 22:00:06 +01:00
|
|
|
}
|
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Load_log_event::copy_log_event()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2001-11-18 01:23:46 +01:00
|
|
|
int Load_log_event::copy_log_event(const char *buf, ulong event_len,
|
2004-11-12 04:01:46 +01:00
|
|
|
int body_offset,
|
|
|
|
const Format_description_log_event *description_event)
|
2000-11-15 22:00:06 +01:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
DBUG_ENTER("Load_log_event::copy_log_event");
|
2001-08-03 23:57:53 +02:00
|
|
|
uint data_len;
|
2001-08-19 04:22:20 +02:00
|
|
|
char* buf_end = (char*)buf + event_len;
|
2004-11-12 04:01:46 +01:00
|
|
|
/* this is the beginning of the post-header */
|
|
|
|
const char* data_head = buf + description_event->common_header_len;
|
2003-10-31 23:20:23 +01:00
|
|
|
slave_proxy_id= thread_id= uint4korr(data_head + L_THREAD_ID_OFFSET);
|
2001-11-18 01:23:46 +01:00
|
|
|
exec_time = uint4korr(data_head + L_EXEC_TIME_OFFSET);
|
|
|
|
skip_lines = uint4korr(data_head + L_SKIP_LINES_OFFSET);
|
|
|
|
table_name_len = (uint)data_head[L_TBL_LEN_OFFSET];
|
|
|
|
db_len = (uint)data_head[L_DB_LEN_OFFSET];
|
|
|
|
num_fields = uint4korr(data_head + L_NUM_FIELDS_OFFSET);
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2001-09-15 15:22:34 +02:00
|
|
|
if ((int) event_len < body_offset)
|
2004-02-16 09:03:25 +01:00
|
|
|
DBUG_RETURN(1);
|
2002-06-11 10:20:31 +02:00
|
|
|
/*
|
|
|
|
Sql_ex.init() on success returns the pointer to the first byte after
|
|
|
|
the sql_ex structure, which is the start of field lengths array.
|
|
|
|
*/
|
2004-11-12 04:01:46 +01:00
|
|
|
if (!(field_lens= (uchar*)sql_ex.init((char*)buf + body_offset,
|
|
|
|
buf_end,
|
|
|
|
buf[EVENT_TYPE_OFFSET] != LOAD_EVENT)))
|
2004-02-16 09:03:25 +01:00
|
|
|
DBUG_RETURN(1);
|
2004-11-12 04:01:46 +01:00
|
|
|
|
2001-08-19 04:22:20 +02:00
|
|
|
data_len = event_len - body_offset;
|
2000-11-15 22:00:06 +01:00
|
|
|
if (num_fields > data_len) // simple sanity check against corruption
|
2004-02-16 09:03:25 +01:00
|
|
|
DBUG_RETURN(1);
|
2002-06-11 10:20:31 +02:00
|
|
|
for (uint i = 0; i < num_fields; i++)
|
2000-11-15 22:00:06 +01:00
|
|
|
field_block_len += (uint)field_lens[i] + 1;
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
fields = (char*)field_lens + num_fields;
|
|
|
|
table_name = fields + field_block_len;
|
|
|
|
db = table_name + table_name_len + 1;
|
|
|
|
fname = db + db_len + 1;
|
2009-02-10 23:47:54 +01:00
|
|
|
fname_len = (uint) strlen(fname);
|
2001-08-19 04:22:20 +02:00
|
|
|
// null termination is accomplished by the caller doing buf[event_len]=0
|
2004-11-12 04:01:46 +01:00
|
|
|
|
2004-02-16 09:03:25 +01:00
|
|
|
DBUG_RETURN(0);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Load_log_event::print()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
#ifdef MYSQL_CLIENT
|
2005-10-19 19:31:24 +02:00
|
|
|
void Load_log_event::print(FILE* file, PRINT_EVENT_INFO* print_event_info)
|
2003-08-19 15:46:47 +02:00
|
|
|
{
|
2005-10-19 19:31:24 +02:00
|
|
|
print(file, print_event_info, 0);
|
2003-08-19 15:46:47 +02:00
|
|
|
}
|
|
|
|
|
2003-08-29 12:44:35 +02:00
|
|
|
|
2006-10-06 10:17:02 +02:00
|
|
|
void Load_log_event::print(FILE* file_arg, PRINT_EVENT_INFO* print_event_info,
|
2003-08-29 12:44:35 +02:00
|
|
|
bool commented)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
Write_on_release_cache cache(&print_event_info->head_cache, file_arg);
|
|
|
|
|
2004-02-16 09:03:25 +01:00
|
|
|
DBUG_ENTER("Load_log_event::print");
|
2005-10-19 19:31:24 +02:00
|
|
|
if (!print_event_info->short_form)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
print_header(&cache, print_event_info, FALSE);
|
|
|
|
my_b_printf(&cache, "\tQuery\tthread_id=%ld\texec_time=%ld\n",
|
|
|
|
thread_id, exec_time);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
2004-04-07 18:34:31 +02:00
|
|
|
bool different_db= 1;
|
2004-11-12 04:01:46 +01:00
|
|
|
if (db)
|
2002-06-05 22:04:38 +02:00
|
|
|
{
|
2004-04-07 18:34:31 +02:00
|
|
|
/*
|
|
|
|
If the database is different from the one of the previous statement, we
|
|
|
|
need to print the "use" command, and we update the last_db.
|
|
|
|
But if commented, the "use" is going to be commented so we should not
|
|
|
|
update the last_db.
|
|
|
|
*/
|
2005-10-19 19:31:24 +02:00
|
|
|
if ((different_db= memcmp(print_event_info->db, db, db_len + 1)) &&
|
2004-04-07 18:34:31 +02:00
|
|
|
!commented)
|
2005-10-19 19:31:24 +02:00
|
|
|
memcpy(print_event_info->db, db, db_len + 1);
|
2002-06-05 22:04:38 +02:00
|
|
|
}
|
2001-04-25 01:39:26 +02:00
|
|
|
|
2004-04-07 18:34:31 +02:00
|
|
|
if (db && db[0] && different_db)
|
2006-12-08 07:33:05 +01:00
|
|
|
my_b_printf(&cache, "%suse %s%s\n",
|
2003-08-19 15:46:47 +02:00
|
|
|
commented ? "# " : "",
|
2006-11-28 13:26:15 +01:00
|
|
|
db, print_event_info->delimiter);
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2004-12-03 23:07:08 +01:00
|
|
|
if (flags & LOG_EVENT_THREAD_SPECIFIC_F)
|
2006-12-08 07:33:05 +01:00
|
|
|
my_b_printf(&cache,"%sSET @@session.pseudo_thread_id=%lu%s\n",
|
2006-11-28 13:26:15 +01:00
|
|
|
commented ? "# " : "", (ulong)thread_id,
|
|
|
|
print_event_info->delimiter);
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(&cache, "%sLOAD DATA ",
|
2006-12-08 07:33:05 +01:00
|
|
|
commented ? "# " : "");
|
2003-01-17 18:52:56 +01:00
|
|
|
if (check_fname_outside_temp_buf())
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(&cache, "LOCAL ");
|
|
|
|
my_b_printf(&cache, "INFILE '%-*s' ", fname_len, fname);
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2003-04-03 20:19:12 +02:00
|
|
|
if (sql_ex.opt_flags & REPLACE_FLAG)
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(&cache," REPLACE ");
|
2003-04-03 20:19:12 +02:00
|
|
|
else if (sql_ex.opt_flags & IGNORE_FLAG)
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(&cache," IGNORE ");
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(&cache, "INTO TABLE `%s`", table_name);
|
|
|
|
my_b_printf(&cache, " FIELDS TERMINATED BY ");
|
|
|
|
pretty_print_str(&cache, sql_ex.field_term, sql_ex.field_term_len);
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2004-02-16 09:03:25 +01:00
|
|
|
if (sql_ex.opt_flags & OPT_ENCLOSED_FLAG)
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(&cache," OPTIONALLY ");
|
|
|
|
my_b_printf(&cache, " ENCLOSED BY ");
|
|
|
|
pretty_print_str(&cache, sql_ex.enclosed, sql_ex.enclosed_len);
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(&cache, " ESCAPED BY ");
|
|
|
|
pretty_print_str(&cache, sql_ex.escaped, sql_ex.escaped_len);
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(&cache," LINES TERMINATED BY ");
|
|
|
|
pretty_print_str(&cache, sql_ex.line_term, sql_ex.line_term_len);
|
2004-02-16 09:03:25 +01:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2001-08-19 04:22:20 +02:00
|
|
|
if (sql_ex.line_start)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(&cache," STARTING BY ");
|
|
|
|
pretty_print_str(&cache, sql_ex.line_start, sql_ex.line_start_len);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2003-08-10 04:14:16 +02:00
|
|
|
if ((long) skip_lines > 0)
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(&cache, " IGNORE %ld LINES", (long) skip_lines);
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2000-11-15 22:00:06 +01:00
|
|
|
if (num_fields)
|
|
|
|
{
|
|
|
|
uint i;
|
|
|
|
const char* field = fields;
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(&cache, " (");
|
2002-06-11 10:20:31 +02:00
|
|
|
for (i = 0; i < num_fields; i++)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2002-06-05 22:04:38 +02:00
|
|
|
if (i)
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(&cache, ",");
|
|
|
|
my_b_printf(&cache, field);
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2000-11-15 22:00:06 +01:00
|
|
|
field += field_lens[i] + 1;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(&cache, ")");
|
2000-11-15 22:00:06 +01:00
|
|
|
}
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2006-12-08 07:33:05 +01:00
|
|
|
my_b_printf(&cache, "%s\n", print_event_info->delimiter);
|
2004-02-16 09:03:25 +01:00
|
|
|
DBUG_VOID_RETURN;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2003-05-19 15:35:49 +02:00
|
|
|
#endif /* MYSQL_CLIENT */
|
2001-07-21 00:22:54 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
#ifndef MYSQL_CLIENT
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
2002-10-30 07:50:07 +01:00
|
|
|
Load_log_event::set_fields()
|
2004-11-15 17:03:54 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@note
|
|
|
|
This function can not use the member variable
|
|
|
|
for the database, since LOAD DATA INFILE on the slave
|
|
|
|
can be for a different database than the current one.
|
|
|
|
This is the reason for the affected_db argument to this method.
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2001-06-19 23:03:48 +02:00
|
|
|
|
2004-11-15 17:03:54 +01:00
|
|
|
void Load_log_event::set_fields(const char* affected_db,
|
2005-07-01 06:05:42 +02:00
|
|
|
List<Item> &field_list,
|
|
|
|
Name_resolution_context *context)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
uint i;
|
2002-11-21 14:56:48 +01:00
|
|
|
const char* field = fields;
|
2002-11-07 02:54:00 +01:00
|
|
|
for (i= 0; i < num_fields; i++)
|
2002-01-29 17:32:16 +01:00
|
|
|
{
|
2005-07-01 06:05:42 +02:00
|
|
|
field_list.push_back(new Item_field(context,
|
|
|
|
affected_db, table_name, field));
|
2002-11-07 02:54:00 +01:00
|
|
|
field+= field_lens[i] + 1;
|
2002-01-29 17:32:16 +01:00
|
|
|
}
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2003-08-11 21:44:43 +02:00
|
|
|
#endif /* !MYSQL_CLIENT */
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
Does the data loading job when executing a LOAD DATA on the slave.
|
|
|
|
|
|
|
|
@param net
|
|
|
|
@param rli
|
|
|
|
@param use_rli_only_for_errors If set to 1, rli is provided to
|
|
|
|
Load_log_event::exec_event only for this
|
|
|
|
function to have RPL_LOG_NAME and
|
|
|
|
rli->last_slave_error, both being used by
|
|
|
|
error reports. rli's position advancing
|
|
|
|
is skipped (done by the caller which is
|
|
|
|
Execute_load_log_event::exec_event).
|
|
|
|
If set to 0, rli is provided for full use,
|
|
|
|
i.e. for error reports and position
|
|
|
|
advancing.
|
|
|
|
|
|
|
|
@todo
|
|
|
|
fix this; this can be done by testing rules in
|
|
|
|
Create_file_log_event::exec_event() and then discarding Append_block and
|
|
|
|
al.
|
|
|
|
@todo
|
|
|
|
this is a bug - this needs to be moved to the I/O thread
|
|
|
|
|
|
|
|
@retval
|
2006-11-01 15:35:37 +01:00
|
|
|
0 Success
|
2007-10-11 19:29:09 +02:00
|
|
|
@retval
|
|
|
|
1 Failure
|
2003-01-09 02:55:26 +01:00
|
|
|
*/
|
2001-06-14 22:12:40 +02:00
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
int Load_log_event::do_apply_event(NET* net, Relay_log_info const *rli,
|
2007-03-22 08:32:41 +01:00
|
|
|
bool use_rli_only_for_errors)
|
2001-06-14 22:12:40 +02:00
|
|
|
{
|
2006-07-13 09:43:52 +02:00
|
|
|
LEX_STRING new_db;
|
|
|
|
new_db.length= db_len;
|
|
|
|
new_db.str= (char *) rpl_filter->get_rewrite_db(db, &new_db.length);
|
|
|
|
thd->set_db(new_db.str, new_db.length);
|
2003-01-19 01:28:07 +01:00
|
|
|
DBUG_ASSERT(thd->query == 0);
|
2004-05-17 10:22:30 +02:00
|
|
|
thd->query_length= 0; // Should not be needed
|
2007-10-19 23:20:38 +02:00
|
|
|
thd->is_slave_error= 0;
|
2007-08-16 07:37:50 +02:00
|
|
|
clear_all_errors(thd, const_cast<Relay_log_info*>(rli));
|
2005-12-22 06:39:02 +01:00
|
|
|
|
2006-11-10 15:10:41 +01:00
|
|
|
/* see Query_log_event::do_apply_event() and BUG#13360 */
|
2005-12-22 06:39:02 +01:00
|
|
|
DBUG_ASSERT(!rli->m_table_map.count());
|
2004-07-21 00:52:35 +02:00
|
|
|
/*
|
Bug#25411 (trigger code truncated), PART I
The issue found with bug 25411 is due to the function skip_rear_comments()
which damages the source code while implementing a work around.
The root cause of the problem is in the lexical analyser, which does not
process special comments properly.
For special comments like :
[1] aaa /*!50000 bbb */ ccc
since 5.0 is a version older that the current code, the parser is in lining
the content of the special comment, so that the query to process is
[2] aaa bbb ccc
However, the text of the query captured when processing a stored procedure,
stored function or trigger (or event in 5.1), can be after rebuilding it:
[3] aaa bbb */ ccc
which is wrong.
To fix bug 25411 properly, the lexical analyser needs to return [2] when
in lining special comments.
In order to implement this, some preliminary cleanup is required in the code,
which is implemented by this patch.
Before this change, the structure named LEX (or st_lex) contains attributes
that belong to lexical analysis, as well as attributes that represents the
abstract syntax tree (AST) of a statement.
Creating a new LEX structure for each statements (which makes sense for the
AST part) also re-initialized the lexical analysis phase each time, which
is conceptually wrong.
With this patch, the previous st_lex structure has been split in two:
- st_lex represents the Abstract Syntax Tree for a statement. The name "lex"
has not been changed to avoid a bigger impact in the code base.
- class lex_input_stream represents the internal state of the lexical
analyser, which by definition should *not* be reinitialized when parsing
multiple statements from the same input stream.
This change is a pre-requisite for bug 25411, since the implementation of
lex_input_stream will later improve to deal properly with special comments,
and this processing can not be done with the current implementation of
sp_head::reset_lex and sp_head::restore_lex, which interfere with the lexer.
This change set alone does not fix bug 25411.
2007-04-24 17:24:21 +02:00
|
|
|
Usually lex_start() is called by mysql_parse(), but we need it here
|
2004-07-21 00:52:35 +02:00
|
|
|
as the present method does not call mysql_parse().
|
|
|
|
*/
|
Bug#25411 (trigger code truncated), PART I
The issue found with bug 25411 is due to the function skip_rear_comments()
which damages the source code while implementing a work around.
The root cause of the problem is in the lexical analyser, which does not
process special comments properly.
For special comments like :
[1] aaa /*!50000 bbb */ ccc
since 5.0 is a version older that the current code, the parser is in lining
the content of the special comment, so that the query to process is
[2] aaa bbb ccc
However, the text of the query captured when processing a stored procedure,
stored function or trigger (or event in 5.1), can be after rebuilding it:
[3] aaa bbb */ ccc
which is wrong.
To fix bug 25411 properly, the lexical analyser needs to return [2] when
in lining special comments.
In order to implement this, some preliminary cleanup is required in the code,
which is implemented by this patch.
Before this change, the structure named LEX (or st_lex) contains attributes
that belong to lexical analysis, as well as attributes that represents the
abstract syntax tree (AST) of a statement.
Creating a new LEX structure for each statements (which makes sense for the
AST part) also re-initialized the lexical analysis phase each time, which
is conceptually wrong.
With this patch, the previous st_lex structure has been split in two:
- st_lex represents the Abstract Syntax Tree for a statement. The name "lex"
has not been changed to avoid a bigger impact in the code base.
- class lex_input_stream represents the internal state of the lexical
analyser, which by definition should *not* be reinitialized when parsing
multiple statements from the same input stream.
This change is a pre-requisite for bug 25411, since the implementation of
lex_input_stream will later improve to deal properly with special comments,
and this processing can not be done with the current implementation of
sp_head::reset_lex and sp_head::restore_lex, which interfere with the lexer.
This change set alone does not fix bug 25411.
2007-04-24 17:24:21 +02:00
|
|
|
lex_start(thd);
|
|
|
|
mysql_reset_thd_for_next_command(thd);
|
|
|
|
|
2004-03-16 21:41:30 +01:00
|
|
|
if (!use_rli_only_for_errors)
|
2001-06-14 22:12:40 +02:00
|
|
|
{
|
2006-11-01 15:35:37 +01:00
|
|
|
/*
|
|
|
|
Saved for InnoDB, see comment in
|
2006-11-10 15:10:41 +01:00
|
|
|
Query_log_event::do_apply_event()
|
2006-11-01 15:35:37 +01:00
|
|
|
*/
|
2007-08-16 07:37:50 +02:00
|
|
|
const_cast<Relay_log_info*>(rli)->future_group_master_log_pos= log_pos;
|
2004-11-12 04:01:46 +01:00
|
|
|
DBUG_PRINT("info", ("log_pos: %lu", (ulong) log_pos));
|
2001-06-14 22:12:40 +02:00
|
|
|
}
|
2004-11-12 04:01:46 +01:00
|
|
|
|
|
|
|
/*
|
2006-11-01 15:35:37 +01:00
|
|
|
We test replicate_*_db rules. Note that we have already prepared
|
|
|
|
the file to load, even if we are going to ignore and delete it
|
|
|
|
now. So it is possible that we did a lot of disk writes for
|
|
|
|
nothing. In other words, a big LOAD DATA INFILE on the master will
|
|
|
|
still consume a lot of space on the slave (space in the relay log
|
|
|
|
+ space of temp files: twice the space of the file to load...)
|
|
|
|
even if it will finally be ignored. TODO: fix this; this can be
|
2006-11-10 15:10:41 +01:00
|
|
|
done by testing rules in Create_file_log_event::do_apply_event()
|
2006-11-01 15:35:37 +01:00
|
|
|
and then discarding Append_block and al. Another way is do the
|
|
|
|
filtering in the I/O thread (more efficient: no disk writes at
|
|
|
|
all).
|
2005-09-01 17:58:00 +02:00
|
|
|
|
|
|
|
|
|
|
|
Note: We do not need to execute reset_one_shot_variables() if this
|
|
|
|
db_ok() test fails.
|
|
|
|
Reason: The db stored in binlog events is the same for SET and for
|
|
|
|
its companion query. If the SET is ignored because of
|
|
|
|
db_ok(), the companion query will also be ignored, and if
|
|
|
|
the companion query is ignored in the db_ok() test of
|
2006-11-10 15:10:41 +01:00
|
|
|
::do_apply_event(), then the companion SET also have so
|
2006-11-01 15:35:37 +01:00
|
|
|
we don't need to reset_one_shot_variables().
|
2003-08-29 12:44:35 +02:00
|
|
|
*/
|
2005-03-08 21:12:35 +01:00
|
|
|
if (rpl_filter->db_ok(thd->db))
|
2001-06-14 22:12:40 +02:00
|
|
|
{
|
2002-10-30 07:50:07 +01:00
|
|
|
thd->set_time((time_t)when);
|
|
|
|
VOID(pthread_mutex_lock(&LOCK_thread_count));
|
2005-01-16 13:16:23 +01:00
|
|
|
thd->query_id = next_query_id();
|
2002-10-30 07:50:07 +01:00
|
|
|
VOID(pthread_mutex_unlock(&LOCK_thread_count));
|
2004-07-21 00:52:35 +02:00
|
|
|
/*
|
|
|
|
Initing thd->row_count is not necessary in theory as this variable has no
|
|
|
|
influence in the case of the slave SQL thread (it is used to generate a
|
|
|
|
"data truncated" warning but which is absorbed and never gets to the
|
|
|
|
error log); still we init it to avoid a Valgrind message.
|
|
|
|
*/
|
2005-03-16 15:11:01 +01:00
|
|
|
mysql_reset_errors(thd, 0);
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
TABLE_LIST tables;
|
|
|
|
bzero((char*) &tables,sizeof(tables));
|
A fix and a test case for
Bug#19022 "Memory bug when switching db during trigger execution"
Bug#17199 "Problem when view calls function from another database."
Bug#18444 "Fully qualified stored function names don't work correctly in
SELECT statements"
Documentation note: this patch introduces a change in behaviour of prepared
statements.
This patch adds a few new invariants with regard to how THD::db should
be used. These invariants should be preserved in future:
- one should never refer to THD::db by pointer and always make a deep copy
(strmake, strdup)
- one should never compare two databases by pointer, but use strncmp or
my_strncasecmp
- TABLE_LIST object table->db should be always initialized in the parser or
by creator of the object.
For prepared statements it means that if the current database is changed
after a statement is prepared, the database that was current at prepare
remains active. This also means that you can not prepare a statement that
implicitly refers to the current database if the latter is not set.
This is not documented, and therefore needs documentation. This is NOT a
change in behavior for almost all SQL statements except:
- ALTER TABLE t1 RENAME t2
- OPTIMIZE TABLE t1
- ANALYZE TABLE t1
- TRUNCATE TABLE t1 --
until this patch t1 or t2 could be evaluated at the first execution of
prepared statement.
CURRENT_DATABASE() still works OK and is evaluated at every execution
of prepared statement.
Note, that in stored routines this is not an issue as the default
database is the database of the stored procedure and "use" statement
is prohibited in stored routines.
This patch makes obsolete the use of check_db_used (it was never used in the
old code too) and all other places that check for table->db and assign it
from THD::db if it's NULL, except the parser.
How this patch was created: THD::{db,db_length} were replaced with a
LEX_STRING, THD::db. All the places that refer to THD::{db,db_length} were
manually checked and:
- if the place uses thd->db by pointer, it was fixed to make a deep copy
- if a place compared two db pointers, it was fixed to compare them by value
(via strcmp/my_strcasecmp, whatever was approproate)
Then this intermediate patch was used to write a smaller patch that does the
same thing but without a rename.
TODO in 5.1:
- remove check_db_used
- deploy THD::set_db in mysql_change_db
See also comments to individual files.
2006-06-26 22:47:52 +02:00
|
|
|
tables.db= thd->strmake(thd->db, thd->db_length);
|
2005-01-06 12:00:13 +01:00
|
|
|
tables.alias = tables.table_name = (char*) table_name;
|
2002-10-30 07:50:07 +01:00
|
|
|
tables.lock_type = TL_WRITE;
|
2003-03-16 18:17:54 +01:00
|
|
|
tables.updating= 1;
|
2004-04-07 12:25:24 +02:00
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
// the table will be opened in mysql_load
|
2005-03-08 21:12:35 +01:00
|
|
|
if (rpl_filter->is_on() && !rpl_filter->tables_ok(thd->db, &tables))
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
|
|
|
// TODO: this is a bug - this needs to be moved to the I/O thread
|
|
|
|
if (net)
|
|
|
|
skip_load_data_infile(net);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
char llbuff[22];
|
2005-03-16 02:32:47 +01:00
|
|
|
char *end;
|
2003-06-05 16:33:38 +02:00
|
|
|
enum enum_duplicates handle_dup;
|
2004-12-31 11:04:35 +01:00
|
|
|
bool ignore= 0;
|
2005-03-16 02:32:47 +01:00
|
|
|
char *load_data_query;
|
|
|
|
|
2004-07-09 01:29:28 +02:00
|
|
|
/*
|
2005-03-16 02:32:47 +01:00
|
|
|
Forge LOAD DATA INFILE query which will be used in SHOW PROCESS LIST
|
|
|
|
and written to slave's binlog if binlogging is on.
|
2004-07-09 01:29:28 +02:00
|
|
|
*/
|
2005-03-16 02:32:47 +01:00
|
|
|
if (!(load_data_query= (char *)thd->alloc(get_query_buffer_length() + 1)))
|
2004-07-09 01:29:28 +02:00
|
|
|
{
|
2005-03-16 02:32:47 +01:00
|
|
|
/*
|
|
|
|
This will set thd->fatal_error in case of OOM. So we surely will notice
|
|
|
|
that something is wrong.
|
|
|
|
*/
|
|
|
|
goto error;
|
2004-07-09 01:29:28 +02:00
|
|
|
}
|
2005-03-16 02:32:47 +01:00
|
|
|
|
|
|
|
print_query(FALSE, load_data_query, &end, (char **)&thd->lex->fname_start,
|
|
|
|
(char **)&thd->lex->fname_end);
|
|
|
|
*end= 0;
|
|
|
|
thd->query_length= end - load_data_query;
|
|
|
|
thd->query= load_data_query;
|
|
|
|
|
2003-04-03 20:19:12 +02:00
|
|
|
if (sql_ex.opt_flags & REPLACE_FLAG)
|
2005-07-05 13:55:54 +02:00
|
|
|
{
|
2003-04-03 20:19:12 +02:00
|
|
|
handle_dup= DUP_REPLACE;
|
2005-07-05 13:55:54 +02:00
|
|
|
}
|
2003-06-05 16:33:38 +02:00
|
|
|
else if (sql_ex.opt_flags & IGNORE_FLAG)
|
2004-12-31 11:04:35 +01:00
|
|
|
{
|
|
|
|
ignore= 1;
|
|
|
|
handle_dup= DUP_ERROR;
|
|
|
|
}
|
2003-06-05 16:33:38 +02:00
|
|
|
else
|
2003-08-29 12:44:35 +02:00
|
|
|
{
|
2003-06-05 16:33:38 +02:00
|
|
|
/*
|
2003-08-29 12:44:35 +02:00
|
|
|
When replication is running fine, if it was DUP_ERROR on the
|
2004-12-31 11:04:35 +01:00
|
|
|
master then we could choose IGNORE here, because if DUP_ERROR
|
2003-06-05 16:33:38 +02:00
|
|
|
suceeded on master, and data is identical on the master and slave,
|
2004-12-31 11:04:35 +01:00
|
|
|
then there should be no uniqueness errors on slave, so IGNORE is
|
2003-06-05 16:33:38 +02:00
|
|
|
the same as DUP_ERROR. But in the unlikely case of uniqueness errors
|
2003-08-29 12:44:35 +02:00
|
|
|
(because the data on the master and slave happen to be different
|
|
|
|
(user error or bug), we want LOAD DATA to print an error message on
|
|
|
|
the slave to discover the problem.
|
2003-06-05 16:33:38 +02:00
|
|
|
|
|
|
|
If reading from net (a 3.23 master), mysql_load() will change this
|
2004-12-31 11:04:35 +01:00
|
|
|
to IGNORE.
|
2003-06-05 16:33:38 +02:00
|
|
|
*/
|
|
|
|
handle_dup= DUP_ERROR;
|
2003-08-29 12:44:35 +02:00
|
|
|
}
|
2005-07-19 18:25:05 +02:00
|
|
|
/*
|
|
|
|
We need to set thd->lex->sql_command and thd->lex->duplicates
|
|
|
|
since InnoDB tests these variables to decide if this is a LOAD
|
|
|
|
DATA ... REPLACE INTO ... statement even though mysql_parse()
|
|
|
|
is not called. This is not needed in 5.0 since there the LOAD
|
|
|
|
DATA ... statement is replicated using mysql_parse(), which
|
|
|
|
sets the thd->lex fields correctly.
|
|
|
|
*/
|
|
|
|
thd->lex->sql_command= SQLCOM_LOAD;
|
|
|
|
thd->lex->duplicates= handle_dup;
|
2003-06-05 16:33:38 +02:00
|
|
|
|
2003-04-03 20:19:12 +02:00
|
|
|
sql_exchange ex((char*)fname, sql_ex.opt_flags & DUMPFILE_FLAG);
|
2002-12-19 06:38:29 +01:00
|
|
|
String field_term(sql_ex.field_term,sql_ex.field_term_len,log_cs);
|
|
|
|
String enclosed(sql_ex.enclosed,sql_ex.enclosed_len,log_cs);
|
|
|
|
String line_term(sql_ex.line_term,sql_ex.line_term_len,log_cs);
|
|
|
|
String line_start(sql_ex.line_start,sql_ex.line_start_len,log_cs);
|
|
|
|
String escaped(sql_ex.escaped,sql_ex.escaped_len, log_cs);
|
2003-04-03 20:19:12 +02:00
|
|
|
ex.field_term= &field_term;
|
|
|
|
ex.enclosed= &enclosed;
|
|
|
|
ex.line_term= &line_term;
|
|
|
|
ex.line_start= &line_start;
|
|
|
|
ex.escaped= &escaped;
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
ex.opt_enclosed = (sql_ex.opt_flags & OPT_ENCLOSED_FLAG);
|
|
|
|
if (sql_ex.empty_flags & FIELD_TERM_EMPTY)
|
|
|
|
ex.field_term->length(0);
|
|
|
|
|
|
|
|
ex.skip_lines = skip_lines;
|
2002-11-21 14:56:48 +01:00
|
|
|
List<Item> field_list;
|
A fix for Bug#26750 "valgrind leak in sp_head" (and post-review
fixes).
The legend: on a replication slave, in case a trigger creation
was filtered out because of application of replicate-do-table/
replicate-ignore-table rule, the parsed definition of a trigger was not
cleaned up properly. LEX::sphead member was left around and leaked
memory. Until the actual implementation of support of
replicate-ignore-table rules for triggers by the patch for Bug 24478 it
was never the case that "case SQLCOM_CREATE_TRIGGER"
was not executed once a trigger was parsed,
so the deletion of lex->sphead there worked and the memory did not leak.
The fix:
The real cause of the bug is that there is no 1 or 2 places where
we can clean up the main LEX after parse. And the reason we
can not have just one or two places where we clean up the LEX is
asymmetric behaviour of MYSQLparse in case of success or error.
One of the root causes of this behaviour is the code in Item::Item()
constructor. There, a newly created item adds itself to THD::free_list
- a single-linked list of Items used in a statement. Yuck. This code
is unaware that we may have more than one statement active at a time,
and always assumes that the free_list of the current statement is
located in THD::free_list. One day we need to be able to explicitly
allocate an item in a given Query_arena.
Thus, when parsing a definition of a stored procedure, like
CREATE PROCEDURE p1() BEGIN SELECT a FROM t1; SELECT b FROM t1; END;
we actually need to reset THD::mem_root, THD::free_list and THD::lex
to parse the nested procedure statement (SELECT *).
The actual reset and restore is implemented in semantic actions
attached to sp_proc_stmt grammar rule.
The problem is that in case of a parsing error inside a nested statement
Bison generated parser would abort immediately, without executing the
restore part of the semantic action. This would leave THD in an
in-the-middle-of-parsing state.
This is why we couldn't have had a single place where we clean up the LEX
after MYSQLparse - in case of an error we needed to do a clean up
immediately, in case of success a clean up could have been delayed.
This left the door open for a memory leak.
One of the following possibilities were considered when working on a fix:
- patch the replication logic to do the clean up. Rejected
as breaks module borders, replication code should not need to know the
gory details of clean up procedure after CREATE TRIGGER.
- wrap MYSQLparse with a function that would do a clean up.
Rejected as ideally we should fix the problem when it happens, not
adjust for it outside of the problematic code.
- make sure MYSQLparse cleans up after itself by invoking the clean up
functionality in the appropriate places before return. Implemented in
this patch.
- use %destructor rule for sp_proc_stmt to restore THD - cleaner
than the prevoius approach, but rejected
because needs a careful analysis of the side effects, and this patch is
for 5.0, and long term we need to use the next alternative anyway
- make sure that sp_proc_stmt doesn't juggle with THD - this is a
large work that will affect many modules.
Cleanup: move main_lex and main_mem_root from Statement to its
only two descendants Prepared_statement and THD. This ensures that
when a Statement instance was created for purposes of statement backup,
we do not involve LEX constructor/destructor, which is fairly expensive.
In order to track that the transformation produces equivalent
functionality please check the respective constructors and destructors
of Statement, Prepared_statement and THD - these members were
used only there.
This cleanup is unrelated to the patch.
2007-03-07 10:24:46 +01:00
|
|
|
thd->lex->select_lex.context.resolve_in_table_list_only(&tables);
|
|
|
|
set_fields(tables.db, field_list, &thd->lex->select_lex.context);
|
2003-04-03 20:19:12 +02:00
|
|
|
thd->variables.pseudo_thread_id= thread_id;
|
2002-10-30 07:50:07 +01:00
|
|
|
if (net)
|
|
|
|
{
|
|
|
|
// mysql_load will use thd->net to read the file
|
|
|
|
thd->net.vio = net->vio;
|
|
|
|
/*
|
|
|
|
Make sure the client does not get confused about the packet sequence
|
|
|
|
*/
|
|
|
|
thd->net.pkt_nr = net->pkt_nr;
|
|
|
|
}
|
2005-03-16 02:32:47 +01:00
|
|
|
/*
|
2006-12-14 23:51:37 +01:00
|
|
|
It is safe to use tmp_list twice because we are not going to
|
2005-03-16 02:32:47 +01:00
|
|
|
update it inside mysql_load().
|
|
|
|
*/
|
2006-12-14 23:51:37 +01:00
|
|
|
List<Item> tmp_list;
|
|
|
|
if (mysql_load(thd, &ex, &tables, field_list, tmp_list, tmp_list,
|
2005-03-16 10:13:35 +01:00
|
|
|
handle_dup, ignore, net != 0))
|
2007-10-19 23:20:38 +02:00
|
|
|
thd->is_slave_error= 1;
|
2002-10-30 07:50:07 +01:00
|
|
|
if (thd->cuted_fields)
|
2003-01-09 02:55:26 +01:00
|
|
|
{
|
2003-08-11 21:44:43 +02:00
|
|
|
/* log_pos is the position of the LOAD event in the master log */
|
2004-11-15 17:03:54 +01:00
|
|
|
sql_print_warning("Slave: load data infile on table '%s' at "
|
|
|
|
"log position %s in log '%s' produced %ld "
|
|
|
|
"warning(s). Default database: '%s'",
|
|
|
|
(char*) table_name,
|
|
|
|
llstr(log_pos,llbuff), RPL_LOG_NAME,
|
|
|
|
(ulong) thd->cuted_fields,
|
|
|
|
print_slave_db_safe(thd->db));
|
2003-01-09 02:55:26 +01:00
|
|
|
}
|
2002-10-30 07:50:07 +01:00
|
|
|
if (net)
|
|
|
|
net->pkt_nr= thd->net.pkt_nr;
|
|
|
|
}
|
2001-06-14 22:12:40 +02:00
|
|
|
}
|
|
|
|
else
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
We will just ask the master to send us /dev/null if we do not
|
|
|
|
want to load the data.
|
|
|
|
TODO: this a bug - needs to be done in I/O thread
|
|
|
|
*/
|
|
|
|
if (net)
|
|
|
|
skip_load_data_infile(net);
|
|
|
|
}
|
2005-03-16 02:32:47 +01:00
|
|
|
|
|
|
|
error:
|
2002-10-30 07:50:07 +01:00
|
|
|
thd->net.vio = 0;
|
A fix and a test case for
Bug#19022 "Memory bug when switching db during trigger execution"
Bug#17199 "Problem when view calls function from another database."
Bug#18444 "Fully qualified stored function names don't work correctly in
SELECT statements"
Documentation note: this patch introduces a change in behaviour of prepared
statements.
This patch adds a few new invariants with regard to how THD::db should
be used. These invariants should be preserved in future:
- one should never refer to THD::db by pointer and always make a deep copy
(strmake, strdup)
- one should never compare two databases by pointer, but use strncmp or
my_strncasecmp
- TABLE_LIST object table->db should be always initialized in the parser or
by creator of the object.
For prepared statements it means that if the current database is changed
after a statement is prepared, the database that was current at prepare
remains active. This also means that you can not prepare a statement that
implicitly refers to the current database if the latter is not set.
This is not documented, and therefore needs documentation. This is NOT a
change in behavior for almost all SQL statements except:
- ALTER TABLE t1 RENAME t2
- OPTIMIZE TABLE t1
- ANALYZE TABLE t1
- TRUNCATE TABLE t1 --
until this patch t1 or t2 could be evaluated at the first execution of
prepared statement.
CURRENT_DATABASE() still works OK and is evaluated at every execution
of prepared statement.
Note, that in stored routines this is not an issue as the default
database is the database of the stored procedure and "use" statement
is prohibited in stored routines.
This patch makes obsolete the use of check_db_used (it was never used in the
old code too) and all other places that check for table->db and assign it
from THD::db if it's NULL, except the parser.
How this patch was created: THD::{db,db_length} were replaced with a
LEX_STRING, THD::db. All the places that refer to THD::{db,db_length} were
manually checked and:
- if the place uses thd->db by pointer, it was fixed to make a deep copy
- if a place compared two db pointers, it was fixed to compare them by value
(via strcmp/my_strcasecmp, whatever was approproate)
Then this intermediate patch was used to write a smaller patch that does the
same thing but without a rename.
TODO in 5.1:
- remove check_db_used
- deploy THD::set_db in mysql_change_db
See also comments to individual files.
2006-06-26 22:47:52 +02:00
|
|
|
const char *remember_db= thd->db;
|
2004-07-09 01:29:28 +02:00
|
|
|
VOID(pthread_mutex_lock(&LOCK_thread_count));
|
A fix and a test case for
Bug#19022 "Memory bug when switching db during trigger execution"
Bug#17199 "Problem when view calls function from another database."
Bug#18444 "Fully qualified stored function names don't work correctly in
SELECT statements"
Documentation note: this patch introduces a change in behaviour of prepared
statements.
This patch adds a few new invariants with regard to how THD::db should
be used. These invariants should be preserved in future:
- one should never refer to THD::db by pointer and always make a deep copy
(strmake, strdup)
- one should never compare two databases by pointer, but use strncmp or
my_strncasecmp
- TABLE_LIST object table->db should be always initialized in the parser or
by creator of the object.
For prepared statements it means that if the current database is changed
after a statement is prepared, the database that was current at prepare
remains active. This also means that you can not prepare a statement that
implicitly refers to the current database if the latter is not set.
This is not documented, and therefore needs documentation. This is NOT a
change in behavior for almost all SQL statements except:
- ALTER TABLE t1 RENAME t2
- OPTIMIZE TABLE t1
- ANALYZE TABLE t1
- TRUNCATE TABLE t1 --
until this patch t1 or t2 could be evaluated at the first execution of
prepared statement.
CURRENT_DATABASE() still works OK and is evaluated at every execution
of prepared statement.
Note, that in stored routines this is not an issue as the default
database is the database of the stored procedure and "use" statement
is prohibited in stored routines.
This patch makes obsolete the use of check_db_used (it was never used in the
old code too) and all other places that check for table->db and assign it
from THD::db if it's NULL, except the parser.
How this patch was created: THD::{db,db_length} were replaced with a
LEX_STRING, THD::db. All the places that refer to THD::{db,db_length} were
manually checked and:
- if the place uses thd->db by pointer, it was fixed to make a deep copy
- if a place compared two db pointers, it was fixed to compare them by value
(via strcmp/my_strcasecmp, whatever was approproate)
Then this intermediate patch was used to write a smaller patch that does the
same thing but without a rename.
TODO in 5.1:
- remove check_db_used
- deploy THD::set_db in mysql_change_db
See also comments to individual files.
2006-06-26 22:47:52 +02:00
|
|
|
thd->catalog= 0;
|
2006-06-28 21:47:45 +02:00
|
|
|
thd->set_db(NULL, 0); /* will free the current database */
|
2004-07-09 01:29:28 +02:00
|
|
|
thd->query= 0;
|
A fix and a test case for
Bug#19022 "Memory bug when switching db during trigger execution"
Bug#17199 "Problem when view calls function from another database."
Bug#18444 "Fully qualified stored function names don't work correctly in
SELECT statements"
Documentation note: this patch introduces a change in behaviour of prepared
statements.
This patch adds a few new invariants with regard to how THD::db should
be used. These invariants should be preserved in future:
- one should never refer to THD::db by pointer and always make a deep copy
(strmake, strdup)
- one should never compare two databases by pointer, but use strncmp or
my_strncasecmp
- TABLE_LIST object table->db should be always initialized in the parser or
by creator of the object.
For prepared statements it means that if the current database is changed
after a statement is prepared, the database that was current at prepare
remains active. This also means that you can not prepare a statement that
implicitly refers to the current database if the latter is not set.
This is not documented, and therefore needs documentation. This is NOT a
change in behavior for almost all SQL statements except:
- ALTER TABLE t1 RENAME t2
- OPTIMIZE TABLE t1
- ANALYZE TABLE t1
- TRUNCATE TABLE t1 --
until this patch t1 or t2 could be evaluated at the first execution of
prepared statement.
CURRENT_DATABASE() still works OK and is evaluated at every execution
of prepared statement.
Note, that in stored routines this is not an issue as the default
database is the database of the stored procedure and "use" statement
is prohibited in stored routines.
This patch makes obsolete the use of check_db_used (it was never used in the
old code too) and all other places that check for table->db and assign it
from THD::db if it's NULL, except the parser.
How this patch was created: THD::{db,db_length} were replaced with a
LEX_STRING, THD::db. All the places that refer to THD::{db,db_length} were
manually checked and:
- if the place uses thd->db by pointer, it was fixed to make a deep copy
- if a place compared two db pointers, it was fixed to compare them by value
(via strcmp/my_strcasecmp, whatever was approproate)
Then this intermediate patch was used to write a smaller patch that does the
same thing but without a rename.
TODO in 5.1:
- remove check_db_used
- deploy THD::set_db in mysql_change_db
See also comments to individual files.
2006-06-26 22:47:52 +02:00
|
|
|
thd->query_length= 0;
|
2004-07-09 01:29:28 +02:00
|
|
|
VOID(pthread_mutex_unlock(&LOCK_thread_count));
|
2002-10-30 07:50:07 +01:00
|
|
|
close_thread_tables(thd);
|
2007-06-09 07:19:37 +02:00
|
|
|
|
|
|
|
DBUG_EXECUTE_IF("LOAD_DATA_INFILE_has_fatal_error",
|
2007-10-19 23:20:38 +02:00
|
|
|
thd->is_slave_error= 0; thd->is_fatal_error= 1;);
|
2007-06-09 07:19:37 +02:00
|
|
|
|
2007-10-19 23:20:38 +02:00
|
|
|
if (thd->is_slave_error)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
2004-10-20 15:06:54 +02:00
|
|
|
/* this err/sql_errno code is copy-paste from net_send_error() */
|
2003-06-05 16:33:38 +02:00
|
|
|
const char *err;
|
|
|
|
int sql_errno;
|
2007-12-12 16:21:01 +01:00
|
|
|
if (thd->is_error())
|
|
|
|
{
|
|
|
|
err= thd->main_da.message();
|
|
|
|
sql_errno= thd->main_da.sql_errno();
|
|
|
|
}
|
2003-06-05 16:33:38 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
sql_errno=ER_UNKNOWN_ERROR;
|
|
|
|
err=ER(sql_errno);
|
|
|
|
}
|
2007-06-09 07:19:37 +02:00
|
|
|
rli->report(ERROR_LEVEL, sql_errno,"\
|
2003-08-29 12:44:35 +02:00
|
|
|
Error '%s' running LOAD DATA INFILE on table '%s'. Default database: '%s'",
|
2006-07-06 20:55:48 +02:00
|
|
|
err, (char*)table_name, print_slave_db_safe(remember_db));
|
2004-11-08 00:13:54 +01:00
|
|
|
free_root(thd->mem_root,MYF(MY_KEEP_PREALLOC));
|
2002-10-30 07:50:07 +01:00
|
|
|
return 1;
|
|
|
|
}
|
2004-11-08 00:13:54 +01:00
|
|
|
free_root(thd->mem_root,MYF(MY_KEEP_PREALLOC));
|
2007-06-09 07:19:37 +02:00
|
|
|
|
2003-01-30 21:15:44 +01:00
|
|
|
if (thd->is_fatal_error)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
2007-06-09 07:19:37 +02:00
|
|
|
char buf[256];
|
|
|
|
my_snprintf(buf, sizeof(buf),
|
|
|
|
"Running LOAD DATA INFILE on table '%-.64s'."
|
|
|
|
" Default database: '%-.64s'",
|
|
|
|
(char*)table_name,
|
|
|
|
print_slave_db_safe(remember_db));
|
|
|
|
|
|
|
|
rli->report(ERROR_LEVEL, ER_SLAVE_FATAL_ERROR,
|
|
|
|
ER(ER_SLAVE_FATAL_ERROR), buf);
|
2002-10-30 07:50:07 +01:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2006-11-10 15:10:41 +01:00
|
|
|
return ( use_rli_only_for_errors ? 0 : Log_event::do_apply_event(rli) );
|
2001-06-14 22:12:40 +02:00
|
|
|
}
|
2003-01-15 09:11:44 +01:00
|
|
|
#endif
|
2001-06-14 22:12:40 +02:00
|
|
|
|
|
|
|
|
2003-05-21 20:39:58 +02:00
|
|
|
/**************************************************************************
|
2003-05-19 15:35:49 +02:00
|
|
|
Rotate_log_event methods
|
2003-05-21 20:39:58 +02:00
|
|
|
**************************************************************************/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Rotate_log_event::pack_info()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2002-12-11 08:17:51 +01:00
|
|
|
void Rotate_log_event::pack_info(Protocol *protocol)
|
2001-06-14 22:12:40 +02:00
|
|
|
{
|
2003-08-29 12:44:35 +02:00
|
|
|
char buf1[256], buf[22];
|
2003-09-11 18:06:23 +02:00
|
|
|
String tmp(buf1, sizeof(buf1), log_cs);
|
2001-07-23 22:35:25 +02:00
|
|
|
tmp.length(0);
|
2003-08-29 12:44:35 +02:00
|
|
|
tmp.append(new_log_ident, ident_len);
|
2005-11-20 19:47:07 +01:00
|
|
|
tmp.append(STRING_WITH_LEN(";pos="));
|
2003-08-29 12:44:35 +02:00
|
|
|
tmp.append(llstr(pos,buf));
|
|
|
|
protocol->store(tmp.ptr(), tmp.length(), &my_charset_bin);
|
2001-06-14 22:12:40 +02:00
|
|
|
}
|
2003-01-15 09:11:44 +01:00
|
|
|
#endif
|
2001-06-14 22:12:40 +02:00
|
|
|
|
2001-07-21 00:22:54 +02:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Rotate_log_event::print()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
#ifdef MYSQL_CLIENT
|
2005-10-19 19:31:24 +02:00
|
|
|
void Rotate_log_event::print(FILE* file, PRINT_EVENT_INFO* print_event_info)
|
2001-06-14 22:12:40 +02:00
|
|
|
{
|
2002-10-30 07:50:07 +01:00
|
|
|
char buf[22];
|
2006-10-06 10:17:02 +02:00
|
|
|
Write_on_release_cache cache(&print_event_info->head_cache, file,
|
|
|
|
Write_on_release_cache::FLUSH_F);
|
2004-11-12 04:01:46 +01:00
|
|
|
|
2005-10-19 19:31:24 +02:00
|
|
|
if (print_event_info->short_form)
|
2001-06-14 22:12:40 +02:00
|
|
|
return;
|
2006-10-06 10:17:02 +02:00
|
|
|
print_header(&cache, print_event_info, FALSE);
|
|
|
|
my_b_printf(&cache, "\tRotate to ");
|
2002-10-30 07:50:07 +01:00
|
|
|
if (new_log_ident)
|
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_b_write(&cache, (uchar*) new_log_ident, (uint)ident_len);
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(&cache, " pos: %s\n", llstr(pos, buf));
|
2001-06-14 22:12:40 +02:00
|
|
|
}
|
2003-08-11 21:44:43 +02:00
|
|
|
#endif /* MYSQL_CLIENT */
|
2001-06-14 22:12:40 +02:00
|
|
|
|
|
|
|
|
2005-10-12 13:29:55 +02:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2005-10-12 13:29:55 +02:00
|
|
|
Rotate_log_event::Rotate_log_event() (2 constructors)
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2005-10-12 13:29:55 +02:00
|
|
|
|
|
|
|
#ifndef MYSQL_CLIENT
|
2005-12-22 06:39:02 +01:00
|
|
|
Rotate_log_event::Rotate_log_event(const char* new_log_ident_arg,
|
2005-10-12 13:29:55 +02:00
|
|
|
uint ident_len_arg, ulonglong pos_arg,
|
|
|
|
uint flags_arg)
|
|
|
|
:Log_event(), new_log_ident(new_log_ident_arg),
|
|
|
|
pos(pos_arg),ident_len(ident_len_arg ? ident_len_arg :
|
|
|
|
(uint) strlen(new_log_ident_arg)), flags(flags_arg)
|
|
|
|
{
|
|
|
|
#ifndef DBUG_OFF
|
|
|
|
char buff[22];
|
2005-12-22 06:39:02 +01:00
|
|
|
DBUG_ENTER("Rotate_log_event::Rotate_log_event(...,flags)");
|
2006-11-20 21:42:06 +01:00
|
|
|
DBUG_PRINT("enter",("new_log_ident: %s pos: %s flags: %lu", new_log_ident_arg,
|
|
|
|
llstr(pos_arg, buff), (ulong) flags));
|
2005-10-12 13:29:55 +02:00
|
|
|
#endif
|
|
|
|
if (flags & DUP_NAME)
|
2006-07-06 20:55:48 +02:00
|
|
|
new_log_ident= my_strndup(new_log_ident_arg, ident_len, MYF(MY_WME));
|
2008-09-28 09:34:25 +02:00
|
|
|
if (flags & RELAY_LOG)
|
|
|
|
set_relay_log_event();
|
2005-10-12 13:29:55 +02:00
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
Rotate_log_event::Rotate_log_event(const char* buf, uint event_len,
|
|
|
|
const Format_description_log_event* description_event)
|
2005-10-13 00:29:23 +02:00
|
|
|
:Log_event(buf, description_event) ,new_log_ident(0), flags(DUP_NAME)
|
2001-06-14 22:12:40 +02:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
DBUG_ENTER("Rotate_log_event::Rotate_log_event(char*,...)");
|
2002-10-30 07:50:07 +01:00
|
|
|
// The caller will ensure that event_len is what we have at EVENT_LEN_OFFSET
|
2004-11-12 04:01:46 +01:00
|
|
|
uint8 header_size= description_event->common_header_len;
|
|
|
|
uint8 post_header_len= description_event->post_header_len[ROTATE_EVENT-1];
|
2002-10-30 07:50:07 +01:00
|
|
|
uint ident_offset;
|
|
|
|
if (event_len < header_size)
|
2004-02-16 09:03:25 +01:00
|
|
|
DBUG_VOID_RETURN;
|
2002-10-30 07:50:07 +01:00
|
|
|
buf += header_size;
|
2004-11-12 04:01:46 +01:00
|
|
|
pos = post_header_len ? uint8korr(buf + R_POS_OFFSET) : 4;
|
|
|
|
ident_len = (uint)(event_len -
|
|
|
|
(header_size+post_header_len));
|
|
|
|
ident_offset = post_header_len;
|
2002-10-30 07:50:07 +01:00
|
|
|
set_if_smaller(ident_len,FN_REFLEN-1);
|
2006-07-06 20:55:48 +02:00
|
|
|
new_log_ident= my_strndup(buf + ident_offset, (uint) ident_len, MYF(MY_WME));
|
2007-03-22 08:32:41 +01:00
|
|
|
DBUG_PRINT("debug", ("new_log_ident: '%s'", new_log_ident));
|
2004-02-16 09:03:25 +01:00
|
|
|
DBUG_VOID_RETURN;
|
2001-06-14 22:12:40 +02:00
|
|
|
}
|
2001-07-21 00:22:54 +02:00
|
|
|
|
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2004-11-12 04:01:46 +01:00
|
|
|
Rotate_log_event::write()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2005-03-22 00:26:12 +01:00
|
|
|
#ifndef MYSQL_CLIENT
|
2004-11-12 04:01:46 +01:00
|
|
|
bool Rotate_log_event::write(IO_CACHE* file)
|
2001-07-21 00:22:54 +02:00
|
|
|
{
|
2002-10-30 07:50:07 +01:00
|
|
|
char buf[ROTATE_HEADER_LEN];
|
2003-08-11 21:44:43 +02:00
|
|
|
int8store(buf + R_POS_OFFSET, pos);
|
2004-11-12 04:01:46 +01:00
|
|
|
return (write_header(file, ROTATE_HEADER_LEN + ident_len) ||
|
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_b_safe_write(file, (uchar*)buf, ROTATE_HEADER_LEN) ||
|
|
|
|
my_b_safe_write(file, (uchar*)new_log_ident, (uint) ident_len));
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
2005-03-22 00:26:12 +01:00
|
|
|
#endif
|
2001-07-21 00:22:54 +02:00
|
|
|
|
2007-01-17 15:06:37 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/*
|
|
|
|
Got a rotate log event from the master.
|
2001-09-21 02:38:35 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
This is mainly used so that we can later figure out the logname and
|
|
|
|
position for the master.
|
2001-09-21 02:38:35 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
We can't rotate the slave's BINlog as this will cause infinitive rotations
|
|
|
|
in a A -> B -> A setup.
|
|
|
|
The NOTES below is a wrong comment which will disappear when 4.1 is merged.
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@retval
|
2002-10-30 07:50:07 +01:00
|
|
|
0 ok
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2007-08-16 07:37:50 +02:00
|
|
|
int Rotate_log_event::do_update_pos(Relay_log_info *rli)
|
2001-07-21 00:22:54 +02:00
|
|
|
{
|
2006-11-10 15:10:41 +01:00
|
|
|
DBUG_ENTER("Rotate_log_event::do_update_pos");
|
2007-01-17 15:06:37 +01:00
|
|
|
#ifndef DBUG_OFF
|
|
|
|
char buf[32];
|
|
|
|
#endif
|
|
|
|
|
2007-03-22 08:32:41 +01:00
|
|
|
DBUG_PRINT("info", ("server_id=%lu; ::server_id=%lu",
|
|
|
|
(ulong) this->server_id, (ulong) ::server_id));
|
2007-01-17 15:06:37 +01:00
|
|
|
DBUG_PRINT("info", ("new_log_ident: %s", this->new_log_ident));
|
|
|
|
DBUG_PRINT("info", ("pos: %s", llstr(this->pos, buf)));
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-10-03 22:14:23 +02:00
|
|
|
/*
|
2007-01-17 15:06:37 +01:00
|
|
|
If we are in a transaction or in a group: the only normal case is
|
|
|
|
when the I/O thread was copying a big transaction, then it was
|
|
|
|
stopped and restarted: we have this in the relay log:
|
|
|
|
|
2003-10-03 22:14:23 +02:00
|
|
|
BEGIN
|
|
|
|
...
|
|
|
|
ROTATE (a fake one)
|
|
|
|
...
|
|
|
|
COMMIT or ROLLBACK
|
2007-01-17 15:06:37 +01:00
|
|
|
|
|
|
|
In that case, we don't want to touch the coordinates which
|
|
|
|
correspond to the beginning of the transaction. Starting from
|
|
|
|
5.0.0, there also are some rotates from the slave itself, in the
|
2007-03-22 08:32:41 +01:00
|
|
|
relay log, which shall not change the group positions.
|
2003-10-03 22:14:23 +02:00
|
|
|
*/
|
2007-03-22 08:32:41 +01:00
|
|
|
if ((server_id != ::server_id || rli->replicate_same_server_id) &&
|
2008-09-28 09:34:25 +02:00
|
|
|
!is_relay_log_event() &&
|
2007-04-12 08:58:04 +02:00
|
|
|
!rli->is_in_group())
|
2003-08-29 12:44:35 +02:00
|
|
|
{
|
2008-09-28 09:34:25 +02:00
|
|
|
pthread_mutex_lock(&rli->data_lock);
|
2007-03-22 08:32:41 +01:00
|
|
|
DBUG_PRINT("info", ("old group_master_log_name: '%s' "
|
|
|
|
"old group_master_log_pos: %lu",
|
|
|
|
rli->group_master_log_name,
|
|
|
|
(ulong) rli->group_master_log_pos));
|
2003-10-03 20:07:08 +02:00
|
|
|
memcpy(rli->group_master_log_name, new_log_ident, ident_len+1);
|
|
|
|
rli->notify_group_master_log_name_update();
|
2008-09-28 09:34:25 +02:00
|
|
|
rli->inc_group_relay_log_pos(pos, TRUE /* skip_lock */);
|
2007-01-17 15:06:37 +01:00
|
|
|
DBUG_PRINT("info", ("new group_master_log_name: '%s' "
|
|
|
|
"new group_master_log_pos: %lu",
|
2004-11-12 04:01:46 +01:00
|
|
|
rli->group_master_log_name,
|
2003-10-03 20:07:08 +02:00
|
|
|
(ulong) rli->group_master_log_pos));
|
2008-09-28 09:34:25 +02:00
|
|
|
pthread_mutex_unlock(&rli->data_lock);
|
|
|
|
flush_relay_log_info(rli);
|
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
/*
|
2005-02-03 16:22:16 +01:00
|
|
|
Reset thd->options and sql_mode etc, because this could be the signal of
|
|
|
|
a master's downgrade from 5.0 to 4.0.
|
2004-11-12 04:01:46 +01:00
|
|
|
However, no need to reset description_event_for_exec: indeed, if the next
|
|
|
|
master is 5.0 (even 5.0.1) we will soon get a Format_desc; if the next
|
|
|
|
master is 4.0 then the events are in the slave's format (conversion).
|
|
|
|
*/
|
|
|
|
set_slave_thread_options(thd);
|
2005-03-22 00:26:12 +01:00
|
|
|
set_slave_thread_default_charset(thd, rli);
|
2004-11-12 04:01:46 +01:00
|
|
|
thd->variables.sql_mode= global_system_variables.sql_mode;
|
2005-02-03 16:22:16 +01:00
|
|
|
thd->variables.auto_increment_increment=
|
|
|
|
thd->variables.auto_increment_offset= 1;
|
2003-08-29 12:44:35 +02:00
|
|
|
}
|
2008-09-28 09:34:25 +02:00
|
|
|
else
|
|
|
|
rli->inc_event_relay_log_pos();
|
|
|
|
|
2006-11-10 15:10:41 +01:00
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
DBUG_RETURN(0);
|
2001-07-21 00:22:54 +02:00
|
|
|
}
|
2006-11-10 15:10:41 +01:00
|
|
|
|
2007-01-17 15:06:37 +01:00
|
|
|
|
|
|
|
Log_event::enum_skip_reason
|
2007-08-16 07:37:50 +02:00
|
|
|
Rotate_log_event::do_shall_skip(Relay_log_info *rli)
|
2007-01-17 15:06:37 +01:00
|
|
|
{
|
2007-03-22 08:32:41 +01:00
|
|
|
enum_skip_reason reason= Log_event::do_shall_skip(rli);
|
2007-01-17 15:06:37 +01:00
|
|
|
|
|
|
|
switch (reason) {
|
2007-03-22 08:32:41 +01:00
|
|
|
case Log_event::EVENT_SKIP_NOT:
|
2007-01-17 15:06:37 +01:00
|
|
|
case Log_event::EVENT_SKIP_COUNT:
|
2007-03-22 08:32:41 +01:00
|
|
|
return Log_event::EVENT_SKIP_NOT;
|
2007-01-17 15:06:37 +01:00
|
|
|
|
2007-03-22 08:32:41 +01:00
|
|
|
case Log_event::EVENT_SKIP_IGNORE:
|
|
|
|
return Log_event::EVENT_SKIP_IGNORE;
|
2007-01-17 15:06:37 +01:00
|
|
|
}
|
|
|
|
DBUG_ASSERT(0);
|
2007-03-27 17:45:23 +02:00
|
|
|
return Log_event::EVENT_SKIP_NOT; // To keep compiler happy
|
2007-01-17 15:06:37 +01:00
|
|
|
}
|
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
#endif
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
|
2003-05-21 20:39:58 +02:00
|
|
|
/**************************************************************************
|
2003-05-19 15:35:49 +02:00
|
|
|
Intvar_log_event methods
|
2003-05-21 20:39:58 +02:00
|
|
|
**************************************************************************/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Intvar_log_event::pack_info()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2001-07-21 00:22:54 +02:00
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2002-12-11 08:17:51 +01:00
|
|
|
void Intvar_log_event::pack_info(Protocol *protocol)
|
2001-07-21 00:22:54 +02:00
|
|
|
{
|
2003-08-29 12:44:35 +02:00
|
|
|
char buf[256], *pos;
|
|
|
|
pos= strmake(buf, get_var_type_name(), sizeof(buf)-23);
|
2003-08-11 21:44:43 +02:00
|
|
|
*pos++= '=';
|
2003-01-21 20:07:59 +01:00
|
|
|
pos= longlong10_to_str(val, pos, -10);
|
2003-08-11 21:44:43 +02:00
|
|
|
protocol->store(buf, (uint) (pos-buf), &my_charset_bin);
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
2003-01-15 09:11:44 +01:00
|
|
|
#endif
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2002-08-30 11:40:40 +02:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Intvar_log_event::Intvar_log_event()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
Intvar_log_event::Intvar_log_event(const char* buf,
|
|
|
|
const Format_description_log_event* description_event)
|
|
|
|
:Log_event(buf, description_event)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2009-01-09 10:48:01 +01:00
|
|
|
/* The Post-Header is empty. The Varible Data part begins immediately. */
|
|
|
|
buf+= description_event->common_header_len +
|
|
|
|
description_event->post_header_len[INTVAR_EVENT-1];
|
2004-11-12 04:01:46 +01:00
|
|
|
type= buf[I_TYPE_OFFSET];
|
|
|
|
val= uint8korr(buf+I_VAL_OFFSET);
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
|
|
|
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Intvar_log_event::get_var_type_name()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
const char* Intvar_log_event::get_var_type_name()
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2002-10-30 07:50:07 +01:00
|
|
|
switch(type) {
|
|
|
|
case LAST_INSERT_ID_EVENT: return "LAST_INSERT_ID";
|
|
|
|
case INSERT_ID_EVENT: return "INSERT_ID";
|
|
|
|
default: /* impossible */ return "UNKNOWN";
|
|
|
|
}
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
|
|
|
|
2002-08-30 11:40:40 +02:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2004-11-12 04:01:46 +01:00
|
|
|
Intvar_log_event::write()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2005-03-22 00:26:12 +01:00
|
|
|
#ifndef MYSQL_CLIENT
|
2004-11-12 04:01:46 +01:00
|
|
|
bool Intvar_log_event::write(IO_CACHE* file)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar buf[9];
|
|
|
|
buf[I_TYPE_OFFSET]= (uchar) type;
|
2002-10-30 07:50:07 +01:00
|
|
|
int8store(buf + I_VAL_OFFSET, val);
|
2004-11-12 04:01:46 +01:00
|
|
|
return (write_header(file, sizeof(buf)) ||
|
|
|
|
my_b_safe_write(file, buf, sizeof(buf)));
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
2005-03-22 00:26:12 +01:00
|
|
|
#endif
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Intvar_log_event::print()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
#ifdef MYSQL_CLIENT
|
2005-10-19 19:31:24 +02:00
|
|
|
void Intvar_log_event::print(FILE* file, PRINT_EVENT_INFO* print_event_info)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2002-10-30 07:50:07 +01:00
|
|
|
char llbuff[22];
|
|
|
|
const char *msg;
|
|
|
|
LINT_INIT(msg);
|
2006-10-06 10:17:02 +02:00
|
|
|
Write_on_release_cache cache(&print_event_info->head_cache, file,
|
|
|
|
Write_on_release_cache::FLUSH_F);
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2005-10-19 19:31:24 +02:00
|
|
|
if (!print_event_info->short_form)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
print_header(&cache, print_event_info, FALSE);
|
|
|
|
my_b_printf(&cache, "\tIntvar\n");
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(&cache, "SET ");
|
2002-10-30 07:50:07 +01:00
|
|
|
switch (type) {
|
|
|
|
case LAST_INSERT_ID_EVENT:
|
|
|
|
msg="LAST_INSERT_ID";
|
|
|
|
break;
|
|
|
|
case INSERT_ID_EVENT:
|
|
|
|
msg="INSERT_ID";
|
|
|
|
break;
|
2006-01-03 17:54:54 +01:00
|
|
|
case INVALID_INT_EVENT:
|
|
|
|
default: // cannot happen
|
|
|
|
msg="INVALID_INT";
|
|
|
|
break;
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
2006-12-08 07:33:05 +01:00
|
|
|
my_b_printf(&cache, "%s=%s%s\n",
|
|
|
|
msg, llstr(val,llbuff), print_event_info->delimiter);
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
2001-07-21 00:22:54 +02:00
|
|
|
#endif
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2006-11-10 15:10:41 +01:00
|
|
|
Intvar_log_event::do_apply_event()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
#if defined(HAVE_REPLICATION)&& !defined(MYSQL_CLIENT)
|
2007-08-16 07:37:50 +02:00
|
|
|
int Intvar_log_event::do_apply_event(Relay_log_info const *rli)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2007-04-12 08:58:04 +02:00
|
|
|
/*
|
|
|
|
We are now in a statement until the associated query log event has
|
|
|
|
been processed.
|
|
|
|
*/
|
2007-08-16 07:37:50 +02:00
|
|
|
const_cast<Relay_log_info*>(rli)->set_flag(Relay_log_info::IN_STMT);
|
2007-04-12 08:58:04 +02:00
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
switch (type) {
|
|
|
|
case LAST_INSERT_ID_EVENT:
|
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
|
|
|
thd->stmt_depends_on_first_successful_insert_id_in_prev_stmt= 1;
|
|
|
|
thd->first_successful_insert_id_in_prev_stmt= val;
|
2002-10-30 07:50:07 +01:00
|
|
|
break;
|
|
|
|
case INSERT_ID_EVENT:
|
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
|
|
|
thd->force_one_auto_inc_interval(val);
|
2002-10-30 07:50:07 +01:00
|
|
|
break;
|
|
|
|
}
|
2006-11-10 15:10:41 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
int Intvar_log_event::do_update_pos(Relay_log_info *rli)
|
2006-11-10 15:10:41 +01:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
rli->inc_event_relay_log_pos();
|
2002-10-30 07:50:07 +01:00
|
|
|
return 0;
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
2007-01-17 15:06:37 +01:00
|
|
|
|
|
|
|
|
|
|
|
Log_event::enum_skip_reason
|
2007-08-16 07:37:50 +02:00
|
|
|
Intvar_log_event::do_shall_skip(Relay_log_info *rli)
|
2007-01-17 15:06:37 +01:00
|
|
|
{
|
|
|
|
/*
|
2007-03-22 08:32:41 +01:00
|
|
|
It is a common error to set the slave skip counter to 1 instead of
|
|
|
|
2 when recovering from an insert which used a auto increment,
|
|
|
|
rand, or user var. Therefore, if the slave skip counter is 1, we
|
|
|
|
just say that this event should be skipped by ignoring it, meaning
|
|
|
|
that we do not change the value of the slave skip counter since it
|
|
|
|
will be decreased by the following insert event.
|
2007-01-17 15:06:37 +01:00
|
|
|
*/
|
2007-10-19 14:18:41 +02:00
|
|
|
return continue_group(rli);
|
2007-01-17 15:06:37 +01:00
|
|
|
}
|
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
#endif
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2003-05-21 20:39:58 +02:00
|
|
|
/**************************************************************************
|
2003-02-14 10:47:41 +01:00
|
|
|
Rand_log_event methods
|
2003-05-21 20:39:58 +02:00
|
|
|
**************************************************************************/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2002-12-11 08:17:51 +01:00
|
|
|
void Rand_log_event::pack_info(Protocol *protocol)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2002-11-21 14:56:48 +01:00
|
|
|
char buf1[256], *pos;
|
|
|
|
pos= strmov(buf1,"rand_seed1=");
|
|
|
|
pos= int10_to_str((long) seed1, pos, 10);
|
|
|
|
pos= strmov(pos, ",rand_seed2=");
|
|
|
|
pos= int10_to_str((long) seed2, pos, 10);
|
2003-03-18 08:34:19 +01:00
|
|
|
protocol->store(buf1, (uint) (pos-buf1), &my_charset_bin);
|
2001-07-21 00:22:54 +02:00
|
|
|
}
|
2003-01-15 09:11:44 +01:00
|
|
|
#endif
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
Rand_log_event::Rand_log_event(const char* buf,
|
|
|
|
const Format_description_log_event* description_event)
|
|
|
|
:Log_event(buf, description_event)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2009-01-09 10:48:01 +01:00
|
|
|
/* The Post-Header is empty. The Variable Data part begins immediately. */
|
|
|
|
buf+= description_event->common_header_len +
|
|
|
|
description_event->post_header_len[RAND_EVENT-1];
|
2004-11-12 04:01:46 +01:00
|
|
|
seed1= uint8korr(buf+RAND_SEED1_OFFSET);
|
|
|
|
seed2= uint8korr(buf+RAND_SEED2_OFFSET);
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2005-03-22 00:26:12 +01:00
|
|
|
#ifndef MYSQL_CLIENT
|
2004-11-12 04:01:46 +01:00
|
|
|
bool Rand_log_event::write(IO_CACHE* file)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar buf[16];
|
2002-10-30 07:50:07 +01:00
|
|
|
int8store(buf + RAND_SEED1_OFFSET, seed1);
|
|
|
|
int8store(buf + RAND_SEED2_OFFSET, seed2);
|
2004-11-12 04:01:46 +01:00
|
|
|
return (write_header(file, sizeof(buf)) ||
|
|
|
|
my_b_safe_write(file, buf, sizeof(buf)));
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
2005-03-22 00:26:12 +01:00
|
|
|
#endif
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
#ifdef MYSQL_CLIENT
|
2005-10-19 19:31:24 +02:00
|
|
|
void Rand_log_event::print(FILE* file, PRINT_EVENT_INFO* print_event_info)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
Write_on_release_cache cache(&print_event_info->head_cache, file,
|
|
|
|
Write_on_release_cache::FLUSH_F);
|
|
|
|
|
2003-02-28 12:29:48 +01:00
|
|
|
char llbuff[22],llbuff2[22];
|
2005-10-19 19:31:24 +02:00
|
|
|
if (!print_event_info->short_form)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
print_header(&cache, print_event_info, FALSE);
|
|
|
|
my_b_printf(&cache, "\tRand\n");
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
2006-12-08 07:33:05 +01:00
|
|
|
my_b_printf(&cache, "SET @@RAND_SEED1=%s, @@RAND_SEED2=%s%s\n",
|
|
|
|
llstr(seed1, llbuff),llstr(seed2, llbuff2),
|
|
|
|
print_event_info->delimiter);
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
2003-08-11 21:44:43 +02:00
|
|
|
#endif /* MYSQL_CLIENT */
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2007-08-16 07:37:50 +02:00
|
|
|
int Rand_log_event::do_apply_event(Relay_log_info const *rli)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2007-04-12 08:58:04 +02:00
|
|
|
/*
|
|
|
|
We are now in a statement until the associated query log event has
|
|
|
|
been processed.
|
|
|
|
*/
|
2007-08-16 07:37:50 +02:00
|
|
|
const_cast<Relay_log_info*>(rli)->set_flag(Relay_log_info::IN_STMT);
|
2007-04-12 08:58:04 +02:00
|
|
|
|
2002-11-21 14:56:48 +01:00
|
|
|
thd->rand.seed1= (ulong) seed1;
|
|
|
|
thd->rand.seed2= (ulong) seed2;
|
2006-11-10 15:10:41 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
int Rand_log_event::do_update_pos(Relay_log_info *rli)
|
2006-11-10 15:10:41 +01:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
rli->inc_event_relay_log_pos();
|
2002-10-30 07:50:07 +01:00
|
|
|
return 0;
|
|
|
|
}
|
2006-11-10 15:10:41 +01:00
|
|
|
|
2007-01-17 15:06:37 +01:00
|
|
|
|
|
|
|
Log_event::enum_skip_reason
|
2007-08-16 07:37:50 +02:00
|
|
|
Rand_log_event::do_shall_skip(Relay_log_info *rli)
|
2007-01-17 15:06:37 +01:00
|
|
|
{
|
|
|
|
/*
|
2007-03-22 08:32:41 +01:00
|
|
|
It is a common error to set the slave skip counter to 1 instead of
|
|
|
|
2 when recovering from an insert which used a auto increment,
|
|
|
|
rand, or user var. Therefore, if the slave skip counter is 1, we
|
|
|
|
just say that this event should be skipped by ignoring it, meaning
|
|
|
|
that we do not change the value of the slave skip counter since it
|
|
|
|
will be decreased by the following insert event.
|
2007-01-17 15:06:37 +01:00
|
|
|
*/
|
2007-10-19 14:18:41 +02:00
|
|
|
return continue_group(rli);
|
2007-01-17 15:06:37 +01:00
|
|
|
}
|
|
|
|
|
2003-08-11 21:44:43 +02:00
|
|
|
#endif /* !MYSQL_CLIENT */
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2003-01-31 06:43:53 +01:00
|
|
|
|
2005-01-16 13:16:23 +01:00
|
|
|
/**************************************************************************
|
|
|
|
Xid_log_event methods
|
|
|
|
**************************************************************************/
|
|
|
|
|
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
|
|
|
void Xid_log_event::pack_info(Protocol *protocol)
|
|
|
|
{
|
2005-02-09 20:04:28 +01:00
|
|
|
char buf[128], *pos;
|
|
|
|
pos= strmov(buf, "COMMIT /* xid=");
|
2006-05-17 22:16:51 +02:00
|
|
|
pos= longlong10_to_str(xid, pos, 10);
|
2005-02-09 20:04:28 +01:00
|
|
|
pos= strmov(pos, " */");
|
2005-01-16 13:16:23 +01:00
|
|
|
protocol->store(buf, (uint) (pos-buf), &my_charset_bin);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
@note
|
|
|
|
It's ok not to use int8store here,
|
2005-01-27 22:38:56 +01:00
|
|
|
as long as xid_t::set(ulonglong) and
|
2007-10-11 19:29:09 +02:00
|
|
|
xid_t::get_my_xid doesn't do it either.
|
|
|
|
We don't care about actual values of xids as long as
|
2005-01-27 22:38:56 +01:00
|
|
|
identical numbers compare identically
|
|
|
|
*/
|
2005-02-21 13:47:57 +01:00
|
|
|
|
|
|
|
Xid_log_event::
|
|
|
|
Xid_log_event(const char* buf,
|
|
|
|
const Format_description_log_event *description_event)
|
2005-01-16 13:16:23 +01:00
|
|
|
:Log_event(buf, description_event)
|
|
|
|
{
|
2009-01-09 10:48:01 +01:00
|
|
|
/* The Post-Header is empty. The Variable Data part begins immediately. */
|
|
|
|
buf+= description_event->common_header_len +
|
|
|
|
description_event->post_header_len[XID_EVENT-1];
|
2005-02-21 13:47:57 +01:00
|
|
|
memcpy((char*) &xid, buf, sizeof(xid));
|
2005-01-16 13:16:23 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-03-22 00:26:12 +01:00
|
|
|
#ifndef MYSQL_CLIENT
|
2005-01-16 13:16:23 +01:00
|
|
|
bool Xid_log_event::write(IO_CACHE* file)
|
|
|
|
{
|
2007-12-14 14:40:45 +01:00
|
|
|
DBUG_EXECUTE_IF("do_not_write_xid", return 0;);
|
2005-01-16 13:16:23 +01:00
|
|
|
return write_header(file, sizeof(xid)) ||
|
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_b_safe_write(file, (uchar*) &xid, sizeof(xid));
|
2005-01-16 13:16:23 +01:00
|
|
|
}
|
2005-03-22 00:26:12 +01:00
|
|
|
#endif
|
2005-01-16 13:16:23 +01:00
|
|
|
|
|
|
|
|
|
|
|
#ifdef MYSQL_CLIENT
|
2005-10-19 19:31:24 +02:00
|
|
|
void Xid_log_event::print(FILE* file, PRINT_EVENT_INFO* print_event_info)
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
Write_on_release_cache cache(&print_event_info->head_cache, file,
|
|
|
|
Write_on_release_cache::FLUSH_F);
|
|
|
|
|
2005-10-19 19:31:24 +02:00
|
|
|
if (!print_event_info->short_form)
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
2005-01-27 22:38:56 +01:00
|
|
|
char buf[64];
|
|
|
|
longlong10_to_str(xid, buf, 10);
|
|
|
|
|
2006-10-06 10:17:02 +02:00
|
|
|
print_header(&cache, print_event_info, FALSE);
|
|
|
|
my_b_printf(&cache, "\tXid = %s\n", buf);
|
2005-01-16 13:16:23 +01:00
|
|
|
}
|
2006-12-08 07:33:05 +01:00
|
|
|
my_b_printf(&cache, "COMMIT%s\n", print_event_info->delimiter);
|
2005-01-16 13:16:23 +01:00
|
|
|
}
|
|
|
|
#endif /* MYSQL_CLIENT */
|
|
|
|
|
|
|
|
|
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2007-08-16 07:37:50 +02:00
|
|
|
int Xid_log_event::do_apply_event(Relay_log_info const *rli)
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
2005-02-09 20:04:28 +01:00
|
|
|
/* For a slave Xid_log_event is COMMIT */
|
2006-01-19 03:56:06 +01:00
|
|
|
general_log_print(thd, COM_QUERY,
|
|
|
|
"COMMIT /* implicit, from Xid_log_event */");
|
2006-11-10 15:10:41 +01:00
|
|
|
return end_trans(thd, COMMIT);
|
2005-01-16 13:16:23 +01:00
|
|
|
}
|
2007-10-19 14:18:41 +02:00
|
|
|
|
|
|
|
Log_event::enum_skip_reason
|
|
|
|
Xid_log_event::do_shall_skip(Relay_log_info *rli)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("Xid_log_event::do_shall_skip");
|
|
|
|
if (rli->slave_skip_counter > 0) {
|
|
|
|
thd->options&= ~OPTION_BEGIN;
|
|
|
|
DBUG_RETURN(Log_event::EVENT_SKIP_COUNT);
|
|
|
|
}
|
|
|
|
DBUG_RETURN(Log_event::do_shall_skip(rli));
|
|
|
|
}
|
2005-01-16 13:16:23 +01:00
|
|
|
#endif /* !MYSQL_CLIENT */
|
|
|
|
|
|
|
|
|
2003-05-21 20:39:58 +02:00
|
|
|
/**************************************************************************
|
2003-02-14 10:47:41 +01:00
|
|
|
User_var_log_event methods
|
2003-05-21 20:39:58 +02:00
|
|
|
**************************************************************************/
|
2003-01-30 18:39:54 +01:00
|
|
|
|
2003-01-31 08:41:39 +01:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2003-01-30 18:39:54 +01:00
|
|
|
void User_var_log_event::pack_info(Protocol* protocol)
|
|
|
|
{
|
|
|
|
char *buf= 0;
|
2004-06-03 23:17:18 +02:00
|
|
|
uint val_offset= 4 + name_len;
|
2003-01-30 18:39:54 +01:00
|
|
|
uint event_len= val_offset;
|
|
|
|
|
|
|
|
if (is_null)
|
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (!(buf= (char*) my_malloc(val_offset + 5, MYF(MY_WME))))
|
|
|
|
return;
|
2003-01-30 18:39:54 +01:00
|
|
|
strmov(buf + val_offset, "NULL");
|
|
|
|
event_len= val_offset + 4;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
switch (type) {
|
|
|
|
case REAL_RESULT:
|
|
|
|
double real_val;
|
|
|
|
float8get(real_val, val);
|
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 (!(buf= (char*) my_malloc(val_offset + FLOATING_POINT_BUFFER,
|
|
|
|
MYF(MY_WME))))
|
|
|
|
return;
|
2003-02-14 10:47:41 +01:00
|
|
|
event_len+= my_sprintf(buf + val_offset,
|
|
|
|
(buf + val_offset, "%.14g", real_val));
|
2003-01-30 18:39:54 +01:00
|
|
|
break;
|
|
|
|
case INT_RESULT:
|
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 (!(buf= (char*) my_malloc(val_offset + 22, MYF(MY_WME))))
|
|
|
|
return;
|
2003-01-30 18:39:54 +01:00
|
|
|
event_len= longlong10_to_str(uint8korr(val), buf + val_offset,-10)-buf;
|
|
|
|
break;
|
2005-02-08 23:50:45 +01:00
|
|
|
case DECIMAL_RESULT:
|
|
|
|
{
|
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 (!(buf= (char*) my_malloc(val_offset + DECIMAL_MAX_STR_LENGTH,
|
|
|
|
MYF(MY_WME))))
|
|
|
|
return;
|
2005-02-08 23:50:45 +01:00
|
|
|
String str(buf+val_offset, DECIMAL_MAX_STR_LENGTH, &my_charset_bin);
|
|
|
|
my_decimal dec;
|
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
|
|
|
binary2my_decimal(E_DEC_FATAL_ERROR, (uchar*) (val+2), &dec, val[0],
|
|
|
|
val[1]);
|
2005-02-08 23:50:45 +01:00
|
|
|
my_decimal2string(E_DEC_FATAL_ERROR, &dec, 0, 0, 0, &str);
|
|
|
|
event_len= str.length() + val_offset;
|
|
|
|
break;
|
|
|
|
}
|
2003-01-30 18:39:54 +01:00
|
|
|
case STRING_RESULT:
|
2004-06-03 23:17:18 +02:00
|
|
|
/* 15 is for 'COLLATE' and other chars */
|
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
|
|
|
buf= (char*) my_malloc(event_len+val_len*2+1+2*MY_CS_NAME_SIZE+15,
|
|
|
|
MYF(MY_WME));
|
2004-06-03 23:17:18 +02:00
|
|
|
CHARSET_INFO *cs;
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (!buf)
|
|
|
|
return;
|
2004-06-03 23:17:18 +02:00
|
|
|
if (!(cs= get_charset(charset_number, MYF(0))))
|
|
|
|
{
|
|
|
|
strmov(buf+val_offset, "???");
|
|
|
|
event_len+= 3;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-06-08 19:55:04 +02:00
|
|
|
char *p= strxmov(buf + val_offset, "_", cs->csname, " ", NullS);
|
|
|
|
p= str_to_hex(p, val, val_len);
|
|
|
|
p= strxmov(p, " COLLATE ", cs->name, NullS);
|
2004-06-03 23:17:18 +02:00
|
|
|
event_len= p-buf;
|
|
|
|
}
|
2003-01-30 18:39:54 +01:00
|
|
|
break;
|
2003-02-17 15:06:51 +01:00
|
|
|
case ROW_RESULT:
|
2003-01-31 11:07:07 +01:00
|
|
|
default:
|
2003-01-30 18:39:54 +01:00
|
|
|
DBUG_ASSERT(1);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
buf[0]= '@';
|
2004-06-03 23:17:18 +02:00
|
|
|
buf[1]= '`';
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
memcpy(buf+2, name, name_len);
|
2004-06-03 23:17:18 +02:00
|
|
|
buf[2+name_len]= '`';
|
|
|
|
buf[3+name_len]= '=';
|
2003-03-18 08:34:19 +01:00
|
|
|
protocol->store(buf, event_len, &my_charset_bin);
|
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(buf, MYF(0));
|
2003-01-30 18:39:54 +01:00
|
|
|
}
|
2003-08-11 21:44:43 +02:00
|
|
|
#endif /* !MYSQL_CLIENT */
|
2003-01-30 18:39:54 +01:00
|
|
|
|
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
User_var_log_event::
|
|
|
|
User_var_log_event(const char* buf,
|
|
|
|
const Format_description_log_event* description_event)
|
|
|
|
:Log_event(buf, description_event)
|
2003-01-30 18:39:54 +01:00
|
|
|
{
|
2009-01-09 10:48:01 +01:00
|
|
|
/* The Post-Header is empty. The Variable Data part begins immediately. */
|
|
|
|
buf+= description_event->common_header_len +
|
|
|
|
description_event->post_header_len[USER_VAR_EVENT-1];
|
2003-01-30 18:39:54 +01:00
|
|
|
name_len= uint4korr(buf);
|
|
|
|
name= (char *) buf + UV_NAME_LEN_SIZE;
|
2003-02-14 10:47:41 +01:00
|
|
|
buf+= UV_NAME_LEN_SIZE + name_len;
|
|
|
|
is_null= (bool) *buf;
|
2003-01-30 18:39:54 +01:00
|
|
|
if (is_null)
|
|
|
|
{
|
|
|
|
type= STRING_RESULT;
|
2003-03-05 15:10:40 +01:00
|
|
|
charset_number= my_charset_bin.number;
|
2003-01-30 18:39:54 +01:00
|
|
|
val_len= 0;
|
|
|
|
val= 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2003-02-14 10:47:41 +01:00
|
|
|
type= (Item_result) buf[UV_VAL_IS_NULL];
|
|
|
|
charset_number= uint4korr(buf + UV_VAL_IS_NULL + UV_VAL_TYPE_SIZE);
|
|
|
|
val_len= uint4korr(buf + UV_VAL_IS_NULL + UV_VAL_TYPE_SIZE +
|
2003-01-30 18:39:54 +01:00
|
|
|
UV_CHARSET_NUMBER_SIZE);
|
2003-02-14 10:47:41 +01:00
|
|
|
val= (char *) (buf + UV_VAL_IS_NULL + UV_VAL_TYPE_SIZE +
|
|
|
|
UV_CHARSET_NUMBER_SIZE + UV_VAL_LEN_SIZE);
|
2003-01-30 18:39:54 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-03-22 00:26:12 +01:00
|
|
|
#ifndef MYSQL_CLIENT
|
2004-11-12 04:01:46 +01:00
|
|
|
bool User_var_log_event::write(IO_CACHE* file)
|
2003-01-30 18:39:54 +01:00
|
|
|
{
|
|
|
|
char buf[UV_NAME_LEN_SIZE];
|
|
|
|
char buf1[UV_VAL_IS_NULL + UV_VAL_TYPE_SIZE +
|
|
|
|
UV_CHARSET_NUMBER_SIZE + UV_VAL_LEN_SIZE];
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar buf2[max(8, DECIMAL_MAX_FIELD_SIZE + 2)], *pos= buf2;
|
2003-03-05 15:10:40 +01:00
|
|
|
uint buf1_length;
|
2004-11-12 04:01:46 +01:00
|
|
|
ulong event_length;
|
2003-03-05 15:10:40 +01:00
|
|
|
|
2003-01-30 18:39:54 +01:00
|
|
|
int4store(buf, name_len);
|
2003-03-05 15:10:40 +01:00
|
|
|
|
|
|
|
if ((buf1[0]= is_null))
|
|
|
|
{
|
|
|
|
buf1_length= 1;
|
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
|
|
|
val_len= 0; // Length of 'pos'
|
2003-03-05 15:10:40 +01:00
|
|
|
}
|
|
|
|
else
|
2003-01-30 18:39:54 +01:00
|
|
|
{
|
|
|
|
buf1[1]= type;
|
|
|
|
int4store(buf1 + 2, charset_number);
|
|
|
|
|
|
|
|
switch (type) {
|
|
|
|
case REAL_RESULT:
|
|
|
|
float8store(buf2, *(double*) val);
|
|
|
|
break;
|
|
|
|
case INT_RESULT:
|
|
|
|
int8store(buf2, *(longlong*) val);
|
|
|
|
break;
|
2005-02-08 23:50:45 +01:00
|
|
|
case DECIMAL_RESULT:
|
|
|
|
{
|
|
|
|
my_decimal *dec= (my_decimal *)val;
|
|
|
|
dec->fix_buffer_pointer();
|
|
|
|
buf2[0]= (char)(dec->intg + dec->frac);
|
|
|
|
buf2[1]= (char)dec->frac;
|
2005-03-21 13:58:34 +01:00
|
|
|
decimal2bin((decimal_t*)val, buf2+2, buf2[0], buf2[1]);
|
2005-02-08 23:50:45 +01:00
|
|
|
val_len= decimal_bin_size(buf2[0], buf2[1]) + 2;
|
|
|
|
break;
|
|
|
|
}
|
2003-01-30 18:39:54 +01:00
|
|
|
case STRING_RESULT:
|
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
|
|
|
pos= (uchar*) val;
|
2003-01-30 18:39:54 +01:00
|
|
|
break;
|
2003-02-17 15:06:51 +01:00
|
|
|
case ROW_RESULT:
|
2003-01-31 11:07:07 +01:00
|
|
|
default:
|
2003-01-30 18:39:54 +01:00
|
|
|
DBUG_ASSERT(1);
|
|
|
|
return 0;
|
|
|
|
}
|
2005-02-08 23:50:45 +01:00
|
|
|
int4store(buf1 + 2 + UV_CHARSET_NUMBER_SIZE, val_len);
|
|
|
|
buf1_length= 10;
|
2003-01-30 18:39:54 +01:00
|
|
|
}
|
2004-11-12 04:01:46 +01:00
|
|
|
|
|
|
|
/* Length of the whole event */
|
|
|
|
event_length= sizeof(buf)+ name_len + buf1_length + val_len;
|
|
|
|
|
|
|
|
return (write_header(file, event_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
|
|
|
my_b_safe_write(file, (uchar*) buf, sizeof(buf)) ||
|
|
|
|
my_b_safe_write(file, (uchar*) name, name_len) ||
|
|
|
|
my_b_safe_write(file, (uchar*) buf1, buf1_length) ||
|
|
|
|
my_b_safe_write(file, pos, val_len));
|
2003-01-30 18:39:54 +01:00
|
|
|
}
|
2005-03-22 00:26:12 +01:00
|
|
|
#endif
|
2003-01-30 18:39:54 +01:00
|
|
|
|
2003-03-05 15:10:40 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2003-01-30 18:39:54 +01:00
|
|
|
User_var_log_event::print()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2003-01-30 18:39:54 +01:00
|
|
|
|
|
|
|
#ifdef MYSQL_CLIENT
|
2005-10-19 19:31:24 +02:00
|
|
|
void User_var_log_event::print(FILE* file, PRINT_EVENT_INFO* print_event_info)
|
2003-01-30 18:39:54 +01:00
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
Write_on_release_cache cache(&print_event_info->head_cache, file,
|
|
|
|
Write_on_release_cache::FLUSH_F);
|
|
|
|
|
2005-10-19 19:31:24 +02:00
|
|
|
if (!print_event_info->short_form)
|
2003-01-30 18:39:54 +01:00
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
print_header(&cache, print_event_info, FALSE);
|
|
|
|
my_b_printf(&cache, "\tUser_var\n");
|
2003-01-30 18:39:54 +01:00
|
|
|
}
|
|
|
|
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(&cache, "SET @`");
|
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_b_write(&cache, (uchar*) name, (uint) (name_len));
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(&cache, "`");
|
2003-01-30 18:39:54 +01:00
|
|
|
|
|
|
|
if (is_null)
|
|
|
|
{
|
2006-12-08 07:33:05 +01:00
|
|
|
my_b_printf(&cache, ":=NULL%s\n", print_event_info->delimiter);
|
2003-01-30 18:39:54 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
switch (type) {
|
|
|
|
case REAL_RESULT:
|
|
|
|
double real_val;
|
2007-11-23 14:41:41 +01:00
|
|
|
char real_buf[FMT_G_BUFSIZE(14)];
|
2003-01-30 18:39:54 +01:00
|
|
|
float8get(real_val, val);
|
2007-11-23 14:41:41 +01:00
|
|
|
my_sprintf(real_buf, (real_buf, "%.14g", real_val));
|
|
|
|
my_b_printf(&cache, ":=%s%s\n", real_buf, print_event_info->delimiter);
|
2003-01-30 18:39:54 +01:00
|
|
|
break;
|
|
|
|
case INT_RESULT:
|
|
|
|
char int_buf[22];
|
|
|
|
longlong10_to_str(uint8korr(val), int_buf, -10);
|
2006-12-08 07:33:05 +01:00
|
|
|
my_b_printf(&cache, ":=%s%s\n", int_buf, print_event_info->delimiter);
|
2003-01-30 18:39:54 +01:00
|
|
|
break;
|
2005-02-08 23:50:45 +01:00
|
|
|
case DECIMAL_RESULT:
|
|
|
|
{
|
|
|
|
char str_buf[200];
|
|
|
|
int str_len= sizeof(str_buf) - 1;
|
|
|
|
int precision= (int)val[0];
|
|
|
|
int scale= (int)val[1];
|
2005-03-21 13:58:34 +01:00
|
|
|
decimal_digit_t dec_buf[10];
|
|
|
|
decimal_t dec;
|
2005-02-08 23:50:45 +01:00
|
|
|
dec.len= 10;
|
|
|
|
dec.buf= dec_buf;
|
|
|
|
|
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
|
|
|
bin2decimal((uchar*) val+2, &dec, precision, scale);
|
2005-02-08 23:50:45 +01:00
|
|
|
decimal2string(&dec, str_buf, &str_len, 0, 0, 0);
|
|
|
|
str_buf[str_len]= 0;
|
2006-12-08 07:33:05 +01:00
|
|
|
my_b_printf(&cache, ":=%s%s\n", str_buf, print_event_info->delimiter);
|
2005-02-08 23:50:45 +01:00
|
|
|
break;
|
|
|
|
}
|
2003-01-30 18:39:54 +01:00
|
|
|
case STRING_RESULT:
|
2004-06-03 23:17:18 +02:00
|
|
|
{
|
2004-06-08 19:55:04 +02:00
|
|
|
/*
|
|
|
|
Let's express the string in hex. That's the most robust way. If we
|
|
|
|
print it in character form instead, we need to escape it with
|
|
|
|
character_set_client which we don't know (we will know it in 5.0, but
|
|
|
|
in 4.1 we don't know it easily when we are printing
|
|
|
|
User_var_log_event). Explanation why we would need to bother with
|
|
|
|
character_set_client (quoting Bar):
|
|
|
|
> Note, the parser doesn't switch to another unescaping mode after
|
|
|
|
> it has met a character set introducer.
|
|
|
|
> For example, if an SJIS client says something like:
|
|
|
|
> SET @a= _ucs2 \0a\0b'
|
|
|
|
> the string constant is still unescaped according to SJIS, not
|
|
|
|
> according to UCS2.
|
|
|
|
*/
|
2004-07-08 14:45:25 +02:00
|
|
|
char *hex_str;
|
|
|
|
CHARSET_INFO *cs;
|
|
|
|
|
|
|
|
if (!(hex_str= (char *)my_alloca(2*val_len+1+2))) // 2 hex digits / byte
|
2004-06-03 23:17:18 +02:00
|
|
|
break; // no error, as we are 'void'
|
2004-07-08 14:45:25 +02:00
|
|
|
str_to_hex(hex_str, val, val_len);
|
2004-06-03 23:17:18 +02:00
|
|
|
/*
|
|
|
|
For proper behaviour when mysqlbinlog|mysql, we need to explicitely
|
|
|
|
specify the variable's collation. It will however cause problems when
|
|
|
|
people want to mysqlbinlog|mysql into another server not supporting the
|
|
|
|
character set. But there's not much to do about this and it's unlikely.
|
|
|
|
*/
|
|
|
|
if (!(cs= get_charset(charset_number, MYF(0))))
|
|
|
|
/*
|
|
|
|
Generate an unusable command (=> syntax error) is probably the best
|
|
|
|
thing we can do here.
|
|
|
|
*/
|
2006-12-08 07:33:05 +01:00
|
|
|
my_b_printf(&cache, ":=???%s\n", print_event_info->delimiter);
|
2004-06-03 23:17:18 +02:00
|
|
|
else
|
2006-12-08 07:33:05 +01:00
|
|
|
my_b_printf(&cache, ":=_%s %s COLLATE `%s`%s\n",
|
|
|
|
cs->csname, hex_str, cs->name,
|
|
|
|
print_event_info->delimiter);
|
2004-07-08 14:45:25 +02:00
|
|
|
my_afree(hex_str);
|
2004-06-03 23:17:18 +02:00
|
|
|
}
|
2003-01-30 18:39:54 +01:00
|
|
|
break;
|
2003-02-17 15:06:51 +01:00
|
|
|
case ROW_RESULT:
|
2003-01-31 11:07:07 +01:00
|
|
|
default:
|
2003-01-31 08:41:39 +01:00
|
|
|
DBUG_ASSERT(1);
|
2003-01-30 18:39:54 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2003-01-15 09:11:44 +01:00
|
|
|
#endif
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2003-01-30 18:39:54 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2006-11-10 15:10:41 +01:00
|
|
|
User_var_log_event::do_apply_event()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2003-01-30 18:39:54 +01:00
|
|
|
|
2003-01-31 08:41:39 +01:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2007-08-16 07:37:50 +02:00
|
|
|
int User_var_log_event::do_apply_event(Relay_log_info const *rli)
|
2003-01-30 18:39:54 +01:00
|
|
|
{
|
|
|
|
Item *it= 0;
|
2004-06-03 23:17:18 +02:00
|
|
|
CHARSET_INFO *charset;
|
|
|
|
if (!(charset= get_charset(charset_number, MYF(MY_WME))))
|
|
|
|
return 1;
|
2003-01-30 18:39:54 +01:00
|
|
|
LEX_STRING user_var_name;
|
|
|
|
user_var_name.str= name;
|
|
|
|
user_var_name.length= name_len;
|
2003-03-04 14:17:29 +01:00
|
|
|
double real_val;
|
|
|
|
longlong int_val;
|
2003-01-30 18:39:54 +01:00
|
|
|
|
2007-04-12 08:58:04 +02:00
|
|
|
/*
|
|
|
|
We are now in a statement until the associated query log event has
|
|
|
|
been processed.
|
|
|
|
*/
|
2007-08-16 07:37:50 +02:00
|
|
|
const_cast<Relay_log_info*>(rli)->set_flag(Relay_log_info::IN_STMT);
|
2007-04-12 08:58:04 +02:00
|
|
|
|
2003-01-30 18:39:54 +01:00
|
|
|
if (is_null)
|
|
|
|
{
|
|
|
|
it= new Item_null();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
switch (type) {
|
|
|
|
case REAL_RESULT:
|
|
|
|
float8get(real_val, val);
|
2007-07-30 10:33:50 +02:00
|
|
|
it= new Item_float(real_val, 0);
|
2003-03-04 14:17:29 +01:00
|
|
|
val= (char*) &real_val; // Pointer to value in native format
|
2003-12-21 18:39:32 +01:00
|
|
|
val_len= 8;
|
2003-01-30 18:39:54 +01:00
|
|
|
break;
|
|
|
|
case INT_RESULT:
|
2003-03-04 14:17:29 +01:00
|
|
|
int_val= (longlong) uint8korr(val);
|
|
|
|
it= new Item_int(int_val);
|
|
|
|
val= (char*) &int_val; // Pointer to value in native format
|
2003-12-21 18:39:32 +01:00
|
|
|
val_len= 8;
|
2003-01-30 18:39:54 +01:00
|
|
|
break;
|
2005-02-08 23:50:45 +01:00
|
|
|
case DECIMAL_RESULT:
|
|
|
|
{
|
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
|
|
|
Item_decimal *dec= new Item_decimal((uchar*) val+2, val[0], val[1]);
|
2005-02-08 23:50:45 +01:00
|
|
|
it= dec;
|
|
|
|
val= (char *)dec->val_decimal(NULL);
|
|
|
|
val_len= sizeof(my_decimal);
|
|
|
|
break;
|
|
|
|
}
|
2003-01-30 18:39:54 +01:00
|
|
|
case STRING_RESULT:
|
|
|
|
it= new Item_string(val, val_len, charset);
|
|
|
|
break;
|
2003-02-17 15:06:51 +01:00
|
|
|
case ROW_RESULT:
|
2003-01-31 11:07:07 +01:00
|
|
|
default:
|
2003-01-30 18:39:54 +01:00
|
|
|
DBUG_ASSERT(1);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Item_func_set_user_var e(user_var_name, it);
|
2004-02-18 00:08:52 +01:00
|
|
|
/*
|
|
|
|
Item_func_set_user_var can't substitute something else on its place =>
|
|
|
|
0 can be passed as last argument (reference on item)
|
2008-07-07 09:58:27 +02:00
|
|
|
|
|
|
|
Fix_fields() can fail, in which case a call of update_hash() might
|
|
|
|
crash the server, so if fix fields fails, we just return with an
|
|
|
|
error.
|
2004-02-18 00:08:52 +01:00
|
|
|
*/
|
2008-07-07 09:58:27 +02:00
|
|
|
if (e.fix_fields(thd, 0))
|
|
|
|
return 1;
|
|
|
|
|
2005-02-21 17:52:15 +01:00
|
|
|
/*
|
|
|
|
A variable can just be considered as a table with
|
|
|
|
a single record and with a single column. Thus, like
|
|
|
|
a column value, it could always have IMPLICIT derivation.
|
|
|
|
*/
|
2006-09-13 19:25:33 +02:00
|
|
|
e.update_hash(val, val_len, type, charset, DERIVATION_IMPLICIT, 0);
|
2004-11-08 00:13:54 +01:00
|
|
|
free_root(thd->mem_root,0);
|
2003-01-30 18:39:54 +01:00
|
|
|
|
2006-11-10 15:10:41 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
int User_var_log_event::do_update_pos(Relay_log_info *rli)
|
2006-11-10 15:10:41 +01:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
rli->inc_event_relay_log_pos();
|
2003-01-30 18:39:54 +01:00
|
|
|
return 0;
|
|
|
|
}
|
2006-11-10 15:10:41 +01:00
|
|
|
|
2007-01-17 15:06:37 +01:00
|
|
|
Log_event::enum_skip_reason
|
2007-08-16 07:37:50 +02:00
|
|
|
User_var_log_event::do_shall_skip(Relay_log_info *rli)
|
2007-03-22 08:32:41 +01:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
It is a common error to set the slave skip counter to 1 instead
|
|
|
|
of 2 when recovering from an insert which used a auto increment,
|
|
|
|
rand, or user var. Therefore, if the slave skip counter is 1, we
|
|
|
|
just say that this event should be skipped by ignoring it, meaning
|
|
|
|
that we do not change the value of the slave skip counter since it
|
|
|
|
will be decreased by the following insert event.
|
|
|
|
*/
|
2007-10-19 14:18:41 +02:00
|
|
|
return continue_group(rli);
|
2007-03-22 08:32:41 +01:00
|
|
|
}
|
2003-08-11 21:44:43 +02:00
|
|
|
#endif /* !MYSQL_CLIENT */
|
2002-05-17 13:29:52 +02:00
|
|
|
|
|
|
|
|
2003-05-21 20:39:58 +02:00
|
|
|
/**************************************************************************
|
2003-02-14 10:47:41 +01:00
|
|
|
Slave_log_event methods
|
2003-05-21 20:39:58 +02:00
|
|
|
**************************************************************************/
|
2003-05-19 15:35:49 +02:00
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
#ifdef HAVE_REPLICATION
|
2003-04-23 15:00:07 +02:00
|
|
|
#ifdef MYSQL_CLIENT
|
2006-10-06 10:17:02 +02:00
|
|
|
void Unknown_log_event::print(FILE* file_arg, PRINT_EVENT_INFO* print_event_info)
|
2003-04-23 15:00:07 +02:00
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
Write_on_release_cache cache(&print_event_info->head_cache, file_arg);
|
|
|
|
|
2005-10-19 19:31:24 +02:00
|
|
|
if (print_event_info->short_form)
|
2003-04-23 15:00:07 +02:00
|
|
|
return;
|
2006-10-06 10:17:02 +02:00
|
|
|
print_header(&cache, print_event_info, FALSE);
|
|
|
|
my_b_printf(&cache, "\n# %s", "Unknown event\n");
|
2003-04-23 15:00:07 +02:00
|
|
|
}
|
|
|
|
#endif
|
2002-12-16 14:33:29 +01:00
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
#ifndef MYSQL_CLIENT
|
2002-12-11 08:17:51 +01:00
|
|
|
void Slave_log_event::pack_info(Protocol *protocol)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
2003-08-11 21:44:43 +02:00
|
|
|
char buf[256+HOSTNAME_LENGTH], *pos;
|
2003-01-17 13:39:29 +01:00
|
|
|
pos= strmov(buf, "host=");
|
|
|
|
pos= strnmov(pos, master_host, HOSTNAME_LENGTH);
|
|
|
|
pos= strmov(pos, ",port=");
|
|
|
|
pos= int10_to_str((long) master_port, pos, 10);
|
|
|
|
pos= strmov(pos, ",log=");
|
|
|
|
pos= strmov(pos, master_log);
|
|
|
|
pos= strmov(pos, ",pos=");
|
2003-01-21 20:07:59 +01:00
|
|
|
pos= longlong10_to_str(master_pos, pos, 10);
|
2003-03-18 08:34:19 +01:00
|
|
|
protocol->store(buf, pos-buf, &my_charset_bin);
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
2003-08-11 21:44:43 +02:00
|
|
|
#endif /* !MYSQL_CLIENT */
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
|
|
|
|
#ifndef MYSQL_CLIENT
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
@todo
|
|
|
|
re-write this better without holding both locks at the same time
|
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
Slave_log_event::Slave_log_event(THD* thd_arg,
|
2007-08-16 07:37:50 +02:00
|
|
|
Relay_log_info* rli)
|
2004-11-12 04:01:46 +01:00
|
|
|
:Log_event(thd_arg, 0, 0) , mem_pool(0), master_host(0)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
|
|
|
DBUG_ENTER("Slave_log_event");
|
|
|
|
if (!rli->inited) // QQ When can this happen ?
|
|
|
|
DBUG_VOID_RETURN;
|
2005-02-17 13:52:16 +01:00
|
|
|
|
2007-08-16 08:52:50 +02:00
|
|
|
Master_info* mi = rli->mi;
|
2002-10-30 07:50:07 +01:00
|
|
|
// TODO: re-write this better without holding both locks at the same time
|
|
|
|
pthread_mutex_lock(&mi->data_lock);
|
|
|
|
pthread_mutex_lock(&rli->data_lock);
|
|
|
|
master_host_len = strlen(mi->host);
|
2003-04-24 15:29:25 +02:00
|
|
|
master_log_len = strlen(rli->group_master_log_name);
|
2002-10-30 07:50:07 +01:00
|
|
|
// on OOM, just do not initialize the structure and print the error
|
|
|
|
if ((mem_pool = (char*)my_malloc(get_data_size() + 1,
|
|
|
|
MYF(MY_WME))))
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2002-10-30 07:50:07 +01:00
|
|
|
master_host = mem_pool + SL_MASTER_HOST_OFFSET ;
|
|
|
|
memcpy(master_host, mi->host, master_host_len + 1);
|
|
|
|
master_log = master_host + master_host_len + 1;
|
2003-04-24 15:29:25 +02:00
|
|
|
memcpy(master_log, rli->group_master_log_name, master_log_len + 1);
|
2002-10-30 07:50:07 +01:00
|
|
|
master_port = mi->port;
|
2003-04-24 15:29:25 +02:00
|
|
|
master_pos = rli->group_master_log_pos;
|
2006-11-20 21:42:06 +01:00
|
|
|
DBUG_PRINT("info", ("master_log: %s pos: %lu", master_log,
|
2002-10-30 07:50:07 +01:00
|
|
|
(ulong) master_pos));
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
2002-10-30 07:50:07 +01:00
|
|
|
else
|
|
|
|
sql_print_error("Out of memory while recording slave event");
|
|
|
|
pthread_mutex_unlock(&rli->data_lock);
|
|
|
|
pthread_mutex_unlock(&mi->data_lock);
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
2003-08-11 21:44:43 +02:00
|
|
|
#endif /* !MYSQL_CLIENT */
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
|
|
|
|
Slave_log_event::~Slave_log_event()
|
|
|
|
{
|
|
|
|
my_free(mem_pool, MYF(MY_ALLOW_ZERO_PTR));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef MYSQL_CLIENT
|
2005-10-19 19:31:24 +02:00
|
|
|
void Slave_log_event::print(FILE* file, PRINT_EVENT_INFO* print_event_info)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
Write_on_release_cache cache(&print_event_info->head_cache, file);
|
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
char llbuff[22];
|
2005-10-19 19:31:24 +02:00
|
|
|
if (print_event_info->short_form)
|
2002-10-30 07:50:07 +01:00
|
|
|
return;
|
2006-10-06 10:17:02 +02:00
|
|
|
print_header(&cache, print_event_info, FALSE);
|
|
|
|
my_b_printf(&cache, "\n\
|
2003-08-11 21:44:43 +02:00
|
|
|
Slave: master_host: '%s' master_port: %d master_log: '%s' master_pos: %s\n",
|
2002-10-30 07:50:07 +01:00
|
|
|
master_host, master_port, master_log, llstr(master_pos, llbuff));
|
|
|
|
}
|
2003-08-11 21:44:43 +02:00
|
|
|
#endif /* MYSQL_CLIENT */
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
|
|
|
|
int Slave_log_event::get_data_size()
|
|
|
|
{
|
|
|
|
return master_host_len + master_log_len + 1 + SL_MASTER_HOST_OFFSET;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-03-22 00:26:12 +01:00
|
|
|
#ifndef MYSQL_CLIENT
|
2004-11-12 04:01:46 +01:00
|
|
|
bool Slave_log_event::write(IO_CACHE* file)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
ulong event_length= get_data_size();
|
2002-10-30 07:50:07 +01:00
|
|
|
int8store(mem_pool + SL_MASTER_POS_OFFSET, master_pos);
|
|
|
|
int2store(mem_pool + SL_MASTER_PORT_OFFSET, master_port);
|
|
|
|
// log and host are already there
|
2004-11-12 04:01:46 +01:00
|
|
|
|
|
|
|
return (write_header(file, event_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
|
|
|
my_b_safe_write(file, (uchar*) mem_pool, event_length));
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
2005-03-22 00:26:12 +01:00
|
|
|
#endif
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
|
|
|
|
void Slave_log_event::init_from_mem_pool(int data_size)
|
|
|
|
{
|
|
|
|
master_pos = uint8korr(mem_pool + SL_MASTER_POS_OFFSET);
|
|
|
|
master_port = uint2korr(mem_pool + SL_MASTER_PORT_OFFSET);
|
|
|
|
master_host = mem_pool + SL_MASTER_HOST_OFFSET;
|
2009-02-13 17:41:47 +01:00
|
|
|
master_host_len = (uint) strlen(master_host);
|
2002-10-30 07:50:07 +01:00
|
|
|
// safety
|
|
|
|
master_log = master_host + master_host_len + 1;
|
|
|
|
if (master_log > mem_pool + data_size)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2002-10-30 07:50:07 +01:00
|
|
|
master_host = 0;
|
|
|
|
return;
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
2009-02-13 17:41:47 +01:00
|
|
|
master_log_len = (uint) strlen(master_log);
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/** This code is not used, so has not been updated to be format-tolerant. */
|
2004-11-12 04:01:46 +01:00
|
|
|
Slave_log_event::Slave_log_event(const char* buf, uint event_len)
|
|
|
|
:Log_event(buf,0) /*unused event*/ ,mem_pool(0),master_host(0)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
if (event_len < LOG_EVENT_HEADER_LEN)
|
2002-10-30 07:50:07 +01:00
|
|
|
return;
|
2004-11-12 04:01:46 +01:00
|
|
|
event_len -= LOG_EVENT_HEADER_LEN;
|
2002-10-30 07:50:07 +01:00
|
|
|
if (!(mem_pool = (char*) my_malloc(event_len + 1, MYF(MY_WME))))
|
|
|
|
return;
|
|
|
|
memcpy(mem_pool, buf + LOG_EVENT_HEADER_LEN, event_len);
|
|
|
|
mem_pool[event_len] = 0;
|
|
|
|
init_from_mem_pool(event_len);
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
|
|
|
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
#ifndef MYSQL_CLIENT
|
2007-08-16 07:37:50 +02:00
|
|
|
int Slave_log_event::do_apply_event(Relay_log_info const *rli)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
|
|
|
if (mysql_bin_log.is_open())
|
|
|
|
mysql_bin_log.write(this);
|
2006-11-10 15:10:41 +01:00
|
|
|
return 0;
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
2003-08-11 21:44:43 +02:00
|
|
|
#endif /* !MYSQL_CLIENT */
|
2002-08-08 02:12:02 +02:00
|
|
|
|
|
|
|
|
2003-05-21 20:39:58 +02:00
|
|
|
/**************************************************************************
|
2003-05-19 15:35:49 +02:00
|
|
|
Stop_log_event methods
|
2003-05-21 20:39:58 +02:00
|
|
|
**************************************************************************/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Stop_log_event::print()
|
2002-08-08 02:12:02 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
#ifdef MYSQL_CLIENT
|
2005-10-19 19:31:24 +02:00
|
|
|
void Stop_log_event::print(FILE* file, PRINT_EVENT_INFO* print_event_info)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
Write_on_release_cache cache(&print_event_info->head_cache, file,
|
|
|
|
Write_on_release_cache::FLUSH_F);
|
|
|
|
|
2005-10-19 19:31:24 +02:00
|
|
|
if (print_event_info->short_form)
|
2002-10-30 07:50:07 +01:00
|
|
|
return;
|
|
|
|
|
2006-10-06 10:17:02 +02:00
|
|
|
print_header(&cache, print_event_info, FALSE);
|
|
|
|
my_b_printf(&cache, "\tStop\n");
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
2003-08-11 21:44:43 +02:00
|
|
|
#endif /* MYSQL_CLIENT */
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
#ifndef MYSQL_CLIENT
|
2002-08-08 02:12:02 +02:00
|
|
|
/*
|
2006-11-01 15:35:37 +01:00
|
|
|
The master stopped. We used to clean up all temporary tables but
|
|
|
|
this is useless as, as the master has shut down properly, it has
|
|
|
|
written all DROP TEMPORARY TABLE (prepared statements' deletion is
|
|
|
|
TODO only when we binlog prep stmts). We used to clean up
|
|
|
|
slave_load_tmpdir, but this is useless as it has been cleared at the
|
|
|
|
end of LOAD DATA INFILE. So we have nothing to do here. The place
|
|
|
|
were we must do this cleaning is in
|
2006-11-10 15:10:41 +01:00
|
|
|
Start_log_event_v3::do_apply_event(), not here. Because if we come
|
2006-11-01 15:35:37 +01:00
|
|
|
here, the master was sane.
|
2002-08-08 02:12:02 +02:00
|
|
|
*/
|
2007-08-16 07:37:50 +02:00
|
|
|
int Stop_log_event::do_update_pos(Relay_log_info *rli)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2002-01-29 17:32:16 +01:00
|
|
|
/*
|
|
|
|
We do not want to update master_log pos because we get a rotate event
|
2003-04-24 15:29:25 +02:00
|
|
|
before stop, so by now group_master_log_name is set to the next log.
|
2002-08-08 02:12:02 +02:00
|
|
|
If we updated it, we will have incorrect master coordinates and this
|
2002-01-29 17:32:16 +01:00
|
|
|
could give false triggers in MASTER_POS_WAIT() that we have reached
|
2002-08-08 02:12:02 +02:00
|
|
|
the target position when in fact we have not.
|
2002-01-29 17:32:16 +01:00
|
|
|
*/
|
2004-11-12 04:01:46 +01:00
|
|
|
if (thd->options & OPTION_BEGIN)
|
|
|
|
rli->inc_event_relay_log_pos();
|
|
|
|
else
|
|
|
|
{
|
|
|
|
rli->inc_group_relay_log_pos(0);
|
|
|
|
flush_relay_log_info(rli);
|
|
|
|
}
|
2001-08-03 23:57:53 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2006-11-10 15:10:41 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
#endif /* !MYSQL_CLIENT */
|
2003-01-15 09:11:44 +01:00
|
|
|
#endif /* HAVE_REPLICATION */
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2003-05-21 20:39:58 +02:00
|
|
|
/**************************************************************************
|
2003-05-19 15:35:49 +02:00
|
|
|
Create_file_log_event methods
|
2003-05-21 20:39:58 +02:00
|
|
|
**************************************************************************/
|
2002-08-08 02:12:02 +02:00
|
|
|
|
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Create_file_log_event ctor
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
#ifndef MYSQL_CLIENT
|
2002-11-21 14:56:48 +01:00
|
|
|
Create_file_log_event::
|
|
|
|
Create_file_log_event(THD* thd_arg, sql_exchange* ex,
|
|
|
|
const char* db_arg, const char* table_name_arg,
|
|
|
|
List<Item>& fields_arg, enum enum_duplicates handle_dup,
|
2004-12-31 11:04:35 +01:00
|
|
|
bool ignore,
|
2008-01-30 16:03:00 +01:00
|
|
|
uchar* block_arg, uint block_len_arg, bool using_trans)
|
2004-12-31 11:04:35 +01:00
|
|
|
:Load_log_event(thd_arg,ex,db_arg,table_name_arg,fields_arg,handle_dup, ignore,
|
2002-11-21 14:56:48 +01:00
|
|
|
using_trans),
|
2004-02-16 09:15:52 +01:00
|
|
|
fake_base(0), block(block_arg), event_buf(0), block_len(block_len_arg),
|
2002-10-30 07:50:07 +01:00
|
|
|
file_id(thd_arg->file_id = mysql_bin_log.next_file_id())
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2004-02-16 09:03:25 +01:00
|
|
|
DBUG_ENTER("Create_file_log_event");
|
2002-10-30 07:50:07 +01:00
|
|
|
sql_ex.force_new_format();
|
2004-02-16 09:03:25 +01:00
|
|
|
DBUG_VOID_RETURN;
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
2002-06-08 20:02:01 +02:00
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Create_file_log_event::write_data_body()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
bool Create_file_log_event::write_data_body(IO_CACHE* file)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
bool res;
|
|
|
|
if ((res= Load_log_event::write_data_body(file)) || fake_base)
|
2002-10-30 07:50:07 +01:00
|
|
|
return res;
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
return (my_b_safe_write(file, (uchar*) "", 1) ||
|
|
|
|
my_b_safe_write(file, (uchar*) block, block_len));
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Create_file_log_event::write_data_header()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-09-11 05:40:08 +02:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
bool Create_file_log_event::write_data_header(IO_CACHE* file)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
bool res;
|
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 buf[CREATE_FILE_HEADER_LEN];
|
2004-11-12 04:01:46 +01:00
|
|
|
if ((res= Load_log_event::write_data_header(file)) || fake_base)
|
|
|
|
return res;
|
2002-10-30 07:50:07 +01:00
|
|
|
int4store(buf + CF_FILE_ID_OFFSET, file_id);
|
2004-11-12 04:01:46 +01:00
|
|
|
return my_b_safe_write(file, buf, CREATE_FILE_HEADER_LEN) != 0;
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Create_file_log_event::write_base()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
bool Create_file_log_event::write_base(IO_CACHE* file)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
bool res;
|
|
|
|
fake_base= 1; // pretend we are Load event
|
|
|
|
res= write(file);
|
|
|
|
fake_base= 0;
|
2002-10-30 07:50:07 +01:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2005-03-22 00:26:12 +01:00
|
|
|
#endif /* !MYSQL_CLIENT */
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Create_file_log_event ctor
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
Create_file_log_event::Create_file_log_event(const char* buf, uint len,
|
|
|
|
const Format_description_log_event* description_event)
|
|
|
|
:Load_log_event(buf,0,description_event),fake_base(0),block(0),inited_from_old(0)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
DBUG_ENTER("Create_file_log_event::Create_file_log_event(char*,...)");
|
|
|
|
uint block_offset;
|
|
|
|
uint header_len= description_event->common_header_len;
|
|
|
|
uint8 load_header_len= description_event->post_header_len[LOAD_EVENT-1];
|
|
|
|
uint8 create_file_header_len= description_event->post_header_len[CREATE_FILE_EVENT-1];
|
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 (!(event_buf= (char*) my_memdup(buf, len, MYF(MY_WME))) ||
|
2004-11-12 04:01:46 +01:00
|
|
|
copy_log_event(event_buf,len,
|
|
|
|
((buf[EVENT_TYPE_OFFSET] == LOAD_EVENT) ?
|
|
|
|
load_header_len + header_len :
|
|
|
|
(fake_base ? (header_len+load_header_len) :
|
|
|
|
(header_len+load_header_len) +
|
|
|
|
create_file_header_len)),
|
|
|
|
description_event))
|
2004-02-16 09:03:25 +01:00
|
|
|
DBUG_VOID_RETURN;
|
2004-11-12 04:01:46 +01:00
|
|
|
if (description_event->binlog_version!=1)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
file_id= uint4korr(buf +
|
|
|
|
header_len +
|
|
|
|
load_header_len + CF_FILE_ID_OFFSET);
|
|
|
|
/*
|
|
|
|
Note that it's ok to use get_data_size() below, because it is computed
|
|
|
|
with values we have already read from this event (because we called
|
|
|
|
copy_log_event()); we are not using slave's format info to decode
|
|
|
|
master's format, we are really using master's format info.
|
|
|
|
Anyway, both formats should be identical (except the common_header_len)
|
|
|
|
as these Load events are not changed between 4.0 and 5.0 (as logging of
|
|
|
|
LOAD DATA INFILE does not use Load_log_event in 5.0).
|
|
|
|
|
|
|
|
The + 1 is for \0 terminating fname
|
|
|
|
*/
|
|
|
|
block_offset= (description_event->common_header_len +
|
|
|
|
Load_log_event::get_data_size() +
|
|
|
|
create_file_header_len + 1);
|
2002-10-30 07:50:07 +01:00
|
|
|
if (len < block_offset)
|
BUG#32407: Impossible to do point-in-time recovery from older binlog
Problem: it is unsafe to read base64-printed events without first
reading the Format_description_log_event (FD). Currently, mysqlbinlog
cannot print the FD.
As a side effect, another bug has also been fixed: When mysqlbinlog
--start-position=X was specified, no ROLLBACK was printed. I changed
this, so that ROLLBACK is always printed.
This patch does several things:
- Format_description_log_event (FD) now print themselves in base64
format.
- mysqlbinlog is now able to print FD events. It has three modes:
--base64-output=auto Print row events in base64 output, and print
FD event. The FD event is printed even if
it is outside the range specified with
--start-position, because it would not be
safe to read row events otherwise. This is
the default.
--base64-output=always Like --base64-output=auto, but also print
base64 output for query events. This is
like the old --base64-output flag, which
is also a shorthand for
--base64-output=always
--base64-output=never Never print base64 output, generate error if
row events occur in binlog. This is
useful to suppress the FD event in binlogs
known not to contain row events (e.g.,
because BINLOG statement is unsafe,
requires root privileges, is not SQL, etc)
- the BINLOG statement now handles FD events correctly, by setting
the thread's rli's relay log's description_event_for_exec to the
loaded event.
In fact, executing a BINLOG statement is almost the same as reading
an event from a relay log. Before my patch, the code for this was
separated (exec_relay_log_event in slave.cc executes events from
the relay log, mysql_client_binlog_statement in sql_binlog.cc
executes BINLOG statements). I needed to augment
mysql_client_binlog_statement to do parts of what
exec_relay_log_event does. Hence, I did a small refactoring and
moved parts of exec_relay_log_event to a new function, which I
named apply_event_and_update_pos. apply_event_and_update_pos is
called both from exec_relay_log_event and from
mysql_client_binlog_statement.
- When a non-FD event is executed in a BINLOG statement, without
previously executing a FD event in a BINLOG statement, it generates
an error, because that's unsafe. I took a new error code for that:
ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENTS.
In order to get a decent error message containing the name of the
event, I added the class method char*
Log_event::get_type_str(Log_event_type type), which returns a
string name for the given Log_event_type. This is just like the
existing char* Log_event::get_type_str(), except it is a class
method that takes the log event type as parameter.
I also added PRE_GA_*_ROWS_LOG_EVENT to Log_event::get_type_str(),
so that names of old rows event are properly printed.
- When reading an event, I added a check that the event type is known
by the current Format_description_log_event. Without this, it may
crash on bad input (and I was struck by this several times).
- I patched the following test cases, which all contain BINLOG
statements for row events which must be preceded by BINLOG
statements for FD events:
- rpl_bug31076
While I was here, I fixed some small things in log_event.cc:
- replaced hard-coded 4 by EVENT_TYPE_OFFSET in 3 places
- replaced return by DBUG_VOID_RETURN in one place
- The name of the logfile can be '-' to indicate stdin. Before my
patch, the code just checked if the first character is '-'; now it
does a full strcmp(). Probably, all arguments that begin with a -
are already handled somewhere else as flags, but I still think it
is better that the code reflects what it is supposed to do, with as
little dependencies as possible on other parts of the code. If we
one day implement that all command line arguments after -- are
files (as most unix tools do), then we need this.
I also fixed the following in slave.cc:
- next_event() was declared twice, and queue_event was not static but
should be static (not used outside the file).
2007-12-14 19:02:02 +01:00
|
|
|
DBUG_VOID_RETURN;
|
2008-01-30 16:03:00 +01:00
|
|
|
block = (uchar*)buf + block_offset;
|
2002-10-30 07:50:07 +01:00
|
|
|
block_len = len - block_offset;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
sql_ex.force_new_format();
|
|
|
|
inited_from_old = 1;
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
2004-02-16 09:03:25 +01:00
|
|
|
DBUG_VOID_RETURN;
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Create_file_log_event::print()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
#ifdef MYSQL_CLIENT
|
2005-10-19 19:31:24 +02:00
|
|
|
void Create_file_log_event::print(FILE* file, PRINT_EVENT_INFO* print_event_info,
|
2005-10-12 23:37:21 +02:00
|
|
|
bool enable_local)
|
2002-10-25 00:48:34 +02:00
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
Write_on_release_cache cache(&print_event_info->head_cache, file);
|
|
|
|
|
2005-10-19 19:31:24 +02:00
|
|
|
if (print_event_info->short_form)
|
2003-01-17 18:52:56 +01:00
|
|
|
{
|
|
|
|
if (enable_local && check_fname_outside_temp_buf())
|
2005-10-19 19:31:24 +02:00
|
|
|
Load_log_event::print(file, print_event_info);
|
2002-10-30 07:50:07 +01:00
|
|
|
return;
|
2003-01-17 18:52:56 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (enable_local)
|
|
|
|
{
|
2005-10-19 19:31:24 +02:00
|
|
|
Load_log_event::print(file, print_event_info,
|
2005-09-29 10:42:23 +02:00
|
|
|
!check_fname_outside_temp_buf());
|
2003-08-29 12:44:35 +02:00
|
|
|
/*
|
|
|
|
That one is for "file_id: etc" below: in mysqlbinlog we want the #, in
|
|
|
|
SHOW BINLOG EVENTS we don't.
|
|
|
|
*/
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(&cache, "#");
|
2003-01-17 18:52:56 +01:00
|
|
|
}
|
|
|
|
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(&cache, " file_id: %d block_len: %d\n", file_id, block_len);
|
2002-10-25 00:48:34 +02:00
|
|
|
}
|
2003-01-17 18:52:56 +01:00
|
|
|
|
2003-08-11 21:44:43 +02:00
|
|
|
|
2005-10-19 19:31:24 +02:00
|
|
|
void Create_file_log_event::print(FILE* file, PRINT_EVENT_INFO* print_event_info)
|
2003-01-17 18:52:56 +01:00
|
|
|
{
|
2005-10-19 19:31:24 +02:00
|
|
|
print(file, print_event_info, 0);
|
2003-01-17 18:52:56 +01:00
|
|
|
}
|
2003-08-11 21:44:43 +02:00
|
|
|
#endif /* MYSQL_CLIENT */
|
2002-10-25 00:48:34 +02:00
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Create_file_log_event::pack_info()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2002-12-11 08:17:51 +01:00
|
|
|
void Create_file_log_event::pack_info(Protocol *protocol)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2003-01-17 13:39:29 +01:00
|
|
|
char buf[NAME_LEN*2 + 30 + 21*2], *pos;
|
|
|
|
pos= strmov(buf, "db=");
|
|
|
|
memcpy(pos, db, db_len);
|
2003-08-11 21:44:43 +02:00
|
|
|
pos= strmov(pos + db_len, ";table=");
|
2003-01-17 13:39:29 +01:00
|
|
|
memcpy(pos, table_name, table_name_len);
|
2003-08-11 21:44:43 +02:00
|
|
|
pos= strmov(pos + table_name_len, ";file_id=");
|
2003-01-17 13:39:29 +01:00
|
|
|
pos= int10_to_str((long) file_id, pos, 10);
|
|
|
|
pos= strmov(pos, ";block_len=");
|
|
|
|
pos= int10_to_str((long) block_len, pos, 10);
|
2003-08-11 21:44:43 +02:00
|
|
|
protocol->store(buf, (uint) (pos-buf), &my_charset_bin);
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
2003-08-29 12:44:35 +02:00
|
|
|
#endif /* defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) */
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
|
2009-01-22 15:55:14 +01:00
|
|
|
/**
|
2006-11-10 15:10:41 +01:00
|
|
|
Create_file_log_event::do_apply_event()
|
2009-01-22 15:55:14 +01:00
|
|
|
Constructor for Create_file_log_event to intantiate an event
|
|
|
|
from the relay log on the slave.
|
|
|
|
|
|
|
|
@retval
|
|
|
|
0 Success
|
|
|
|
@retval
|
|
|
|
1 Failure
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2007-08-16 07:37:50 +02:00
|
|
|
int Create_file_log_event::do_apply_event(Relay_log_info const *rli)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2006-01-05 23:47:49 +01:00
|
|
|
char proc_info[17+FN_REFLEN+10], *fname_buf;
|
|
|
|
char *ext;
|
2001-08-03 23:57:53 +02:00
|
|
|
int fd = -1;
|
|
|
|
IO_CACHE file;
|
|
|
|
int error = 1;
|
2001-09-15 15:22:34 +02:00
|
|
|
|
2001-08-03 23:57:53 +02:00
|
|
|
bzero((char*)&file, sizeof(file));
|
2006-01-05 23:47:49 +01:00
|
|
|
fname_buf= strmov(proc_info, "Making temp file ");
|
|
|
|
ext= slave_load_file_stem(fname_buf, file_id, server_id, ".info");
|
2007-02-22 16:03:08 +01:00
|
|
|
thd_proc_info(thd, proc_info);
|
2005-03-25 14:51:17 +01:00
|
|
|
my_delete(fname_buf, MYF(0)); // old copy may exist already
|
|
|
|
if ((fd= my_create(fname_buf, CREATE_MODE,
|
|
|
|
O_WRONLY | O_BINARY | O_EXCL | O_NOFOLLOW,
|
|
|
|
MYF(MY_WME))) < 0 ||
|
2001-08-03 23:57:53 +02:00
|
|
|
init_io_cache(&file, fd, IO_SIZE, WRITE_CACHE, (my_off_t)0, 0,
|
|
|
|
MYF(MY_WME|MY_NABP)))
|
|
|
|
{
|
2007-06-09 07:19:37 +02:00
|
|
|
rli->report(ERROR_LEVEL, my_errno,
|
|
|
|
"Error in Create_file event: could not open file '%s'",
|
|
|
|
fname_buf);
|
2001-08-03 23:57:53 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
// a trick to avoid allocating another buffer
|
2006-01-05 23:47:49 +01:00
|
|
|
fname= fname_buf;
|
|
|
|
fname_len= (uint) (strmov(ext, ".data") - fname);
|
2001-08-03 23:57:53 +02:00
|
|
|
if (write_base(&file))
|
|
|
|
{
|
2006-01-05 23:47:49 +01:00
|
|
|
strmov(ext, ".info"); // to have it right in the error message
|
2007-06-09 07:19:37 +02:00
|
|
|
rli->report(ERROR_LEVEL, my_errno,
|
|
|
|
"Error in Create_file event: could not write to file '%s'",
|
|
|
|
fname_buf);
|
2001-08-03 23:57:53 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
end_io_cache(&file);
|
|
|
|
my_close(fd, MYF(0));
|
|
|
|
|
|
|
|
// fname_buf now already has .data, not .info, because we did our trick
|
2005-03-25 14:51:17 +01:00
|
|
|
my_delete(fname_buf, MYF(0)); // old copy may exist already
|
|
|
|
if ((fd= my_create(fname_buf, CREATE_MODE,
|
|
|
|
O_WRONLY | O_BINARY | O_EXCL | O_NOFOLLOW,
|
|
|
|
MYF(MY_WME))) < 0)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2007-06-09 07:19:37 +02:00
|
|
|
rli->report(ERROR_LEVEL, my_errno,
|
|
|
|
"Error in Create_file event: could not open file '%s'",
|
|
|
|
fname_buf);
|
2001-08-03 23:57:53 +02:00
|
|
|
goto err;
|
|
|
|
}
|
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 (my_write(fd, (uchar*) block, block_len, MYF(MY_WME+MY_NABP)))
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2007-06-09 07:19:37 +02:00
|
|
|
rli->report(ERROR_LEVEL, my_errno,
|
|
|
|
"Error in Create_file event: write to '%s' failed",
|
|
|
|
fname_buf);
|
2001-08-03 23:57:53 +02:00
|
|
|
goto err;
|
|
|
|
}
|
2002-06-11 10:20:31 +02:00
|
|
|
error=0; // Everything is ok
|
|
|
|
|
2001-08-03 23:57:53 +02:00
|
|
|
err:
|
|
|
|
if (error)
|
|
|
|
end_io_cache(&file);
|
|
|
|
if (fd >= 0)
|
|
|
|
my_close(fd, MYF(0));
|
2007-02-22 16:03:08 +01:00
|
|
|
thd_proc_info(thd, 0);
|
2009-01-22 15:55:14 +01:00
|
|
|
return error != 0;
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
2003-08-29 12:44:35 +02:00
|
|
|
#endif /* defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) */
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-21 20:39:58 +02:00
|
|
|
/**************************************************************************
|
2003-05-19 15:35:49 +02:00
|
|
|
Append_block_log_event methods
|
2003-05-21 20:39:58 +02:00
|
|
|
**************************************************************************/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Append_block_log_event ctor
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
#ifndef MYSQL_CLIENT
|
2007-08-14 14:20:05 +02:00
|
|
|
Append_block_log_event::Append_block_log_event(THD *thd_arg,
|
|
|
|
const char *db_arg,
|
2008-01-30 16:03:00 +01:00
|
|
|
uchar *block_arg,
|
2002-11-21 14:56:48 +01:00
|
|
|
uint block_len_arg,
|
|
|
|
bool using_trans)
|
|
|
|
:Log_event(thd_arg,0, using_trans), block(block_arg),
|
2003-08-29 12:44:35 +02:00
|
|
|
block_len(block_len_arg), file_id(thd_arg->file_id), db(db_arg)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
|
|
|
}
|
2003-05-19 15:35:49 +02:00
|
|
|
#endif
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Append_block_log_event ctor
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
Append_block_log_event::Append_block_log_event(const char* buf, uint len,
|
|
|
|
const Format_description_log_event* description_event)
|
|
|
|
:Log_event(buf, description_event),block(0)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
DBUG_ENTER("Append_block_log_event::Append_block_log_event(char*,...)");
|
|
|
|
uint8 common_header_len= description_event->common_header_len;
|
|
|
|
uint8 append_block_header_len=
|
|
|
|
description_event->post_header_len[APPEND_BLOCK_EVENT-1];
|
|
|
|
uint total_header_len= common_header_len+append_block_header_len;
|
|
|
|
if (len < total_header_len)
|
2004-02-16 09:03:25 +01:00
|
|
|
DBUG_VOID_RETURN;
|
2004-11-12 04:01:46 +01:00
|
|
|
file_id= uint4korr(buf + common_header_len + AB_FILE_ID_OFFSET);
|
2008-01-30 16:03:00 +01:00
|
|
|
block= (uchar*)buf + total_header_len;
|
2004-11-12 04:01:46 +01:00
|
|
|
block_len= len - total_header_len;
|
2004-02-16 09:03:25 +01:00
|
|
|
DBUG_VOID_RETURN;
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2004-11-12 04:01:46 +01:00
|
|
|
Append_block_log_event::write()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2005-03-22 00:26:12 +01:00
|
|
|
#ifndef MYSQL_CLIENT
|
2004-11-12 04:01:46 +01:00
|
|
|
bool Append_block_log_event::write(IO_CACHE* file)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar buf[APPEND_BLOCK_HEADER_LEN];
|
2002-10-30 07:50:07 +01:00
|
|
|
int4store(buf + AB_FILE_ID_OFFSET, file_id);
|
2004-11-12 04:01:46 +01:00
|
|
|
return (write_header(file, APPEND_BLOCK_HEADER_LEN + block_len) ||
|
|
|
|
my_b_safe_write(file, buf, APPEND_BLOCK_HEADER_LEN) ||
|
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_b_safe_write(file, (uchar*) block, block_len));
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
2005-03-22 00:26:12 +01:00
|
|
|
#endif
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Append_block_log_event::print()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
#ifdef MYSQL_CLIENT
|
2005-10-12 23:37:21 +02:00
|
|
|
void Append_block_log_event::print(FILE* file,
|
2005-10-19 19:31:24 +02:00
|
|
|
PRINT_EVENT_INFO* print_event_info)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
Write_on_release_cache cache(&print_event_info->head_cache, file);
|
|
|
|
|
2005-10-19 19:31:24 +02:00
|
|
|
if (print_event_info->short_form)
|
2002-10-30 07:50:07 +01:00
|
|
|
return;
|
2006-10-06 10:17:02 +02:00
|
|
|
print_header(&cache, print_event_info, FALSE);
|
|
|
|
my_b_printf(&cache, "\n#%s: file_id: %d block_len: %d\n",
|
|
|
|
get_type_str(), file_id, block_len);
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
2003-08-11 21:44:43 +02:00
|
|
|
#endif /* MYSQL_CLIENT */
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Append_block_log_event::pack_info()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2002-12-11 08:17:51 +01:00
|
|
|
void Append_block_log_event::pack_info(Protocol *protocol)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
|
|
|
char buf[256];
|
|
|
|
uint length;
|
|
|
|
length= (uint) my_sprintf(buf,
|
|
|
|
(buf, ";file_id=%u;block_len=%u", file_id,
|
|
|
|
block_len));
|
2003-08-11 21:44:43 +02:00
|
|
|
protocol->store(buf, length, &my_charset_bin);
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-03-16 02:32:47 +01:00
|
|
|
/*
|
2005-03-25 14:51:17 +01:00
|
|
|
Append_block_log_event::get_create_or_append()
|
2005-03-16 02:32:47 +01:00
|
|
|
*/
|
|
|
|
|
2005-03-25 14:51:17 +01:00
|
|
|
int Append_block_log_event::get_create_or_append() const
|
2005-03-16 02:32:47 +01:00
|
|
|
{
|
2005-03-25 14:51:17 +01:00
|
|
|
return 0; /* append to the file, fail if not exists */
|
2005-03-16 02:32:47 +01:00
|
|
|
}
|
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2006-11-10 15:10:41 +01:00
|
|
|
Append_block_log_event::do_apply_event()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2001-08-03 23:57:53 +02:00
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
int Append_block_log_event::do_apply_event(Relay_log_info const *rli)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2004-06-30 15:41:35 +02:00
|
|
|
char proc_info[17+FN_REFLEN+10], *fname= proc_info+17;
|
2002-06-11 10:20:31 +02:00
|
|
|
int fd;
|
2001-08-03 23:57:53 +02:00
|
|
|
int error = 1;
|
2006-11-10 15:10:41 +01:00
|
|
|
DBUG_ENTER("Append_block_log_event::do_apply_event");
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2006-01-05 23:47:49 +01:00
|
|
|
fname= strmov(proc_info, "Making temp file ");
|
|
|
|
slave_load_file_stem(fname, file_id, server_id, ".data");
|
2007-02-22 16:03:08 +01:00
|
|
|
thd_proc_info(thd, proc_info);
|
2005-03-25 14:51:17 +01:00
|
|
|
if (get_create_or_append())
|
|
|
|
{
|
2009-03-18 11:31:17 +01:00
|
|
|
/*
|
|
|
|
Usually lex_start() is called by mysql_parse(), but we need it here
|
|
|
|
as the present method does not call mysql_parse().
|
|
|
|
*/
|
|
|
|
lex_start(thd);
|
|
|
|
mysql_reset_thd_for_next_command(thd);
|
2005-03-25 14:51:17 +01:00
|
|
|
my_delete(fname, MYF(0)); // old copy may exist already
|
|
|
|
if ((fd= my_create(fname, CREATE_MODE,
|
|
|
|
O_WRONLY | O_BINARY | O_EXCL | O_NOFOLLOW,
|
|
|
|
MYF(MY_WME))) < 0)
|
|
|
|
{
|
2007-06-09 07:19:37 +02:00
|
|
|
rli->report(ERROR_LEVEL, my_errno,
|
|
|
|
"Error in %s event: could not create file '%s'",
|
|
|
|
get_type_str(), fname);
|
2005-03-25 14:51:17 +01:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
2005-03-30 15:00:31 +02:00
|
|
|
else if ((fd = my_open(fname, O_WRONLY | O_APPEND | O_BINARY | O_NOFOLLOW,
|
|
|
|
MYF(MY_WME))) < 0)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2007-06-09 07:19:37 +02:00
|
|
|
rli->report(ERROR_LEVEL, my_errno,
|
|
|
|
"Error in %s event: could not open file '%s'",
|
|
|
|
get_type_str(), fname);
|
2001-08-03 23:57:53 +02:00
|
|
|
goto err;
|
|
|
|
}
|
2009-03-18 11:31:17 +01:00
|
|
|
|
|
|
|
DBUG_EXECUTE_IF("remove_slave_load_file_before_write",
|
|
|
|
my_close(fd,MYF(0)); fd= -1; my_delete(fname, MYF(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
|
|
|
if (my_write(fd, (uchar*) block, block_len, MYF(MY_WME+MY_NABP)))
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2007-06-09 07:19:37 +02:00
|
|
|
rli->report(ERROR_LEVEL, my_errno,
|
|
|
|
"Error in %s event: write to '%s' failed",
|
|
|
|
get_type_str(), fname);
|
2001-08-03 23:57:53 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
error=0;
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2001-08-03 23:57:53 +02:00
|
|
|
err:
|
|
|
|
if (fd >= 0)
|
|
|
|
my_close(fd, MYF(0));
|
2007-02-22 16:03:08 +01:00
|
|
|
thd_proc_info(thd, 0);
|
2006-11-10 15:10:41 +01:00
|
|
|
DBUG_RETURN(error);
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
2003-01-15 09:11:44 +01:00
|
|
|
#endif
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
|
2003-05-21 20:39:58 +02:00
|
|
|
/**************************************************************************
|
2003-05-19 15:35:49 +02:00
|
|
|
Delete_file_log_event methods
|
2003-05-21 20:39:58 +02:00
|
|
|
**************************************************************************/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Delete_file_log_event ctor
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
#ifndef MYSQL_CLIENT
|
2003-08-29 12:44:35 +02:00
|
|
|
Delete_file_log_event::Delete_file_log_event(THD *thd_arg, const char* db_arg,
|
|
|
|
bool using_trans)
|
|
|
|
:Log_event(thd_arg, 0, using_trans), file_id(thd_arg->file_id), db(db_arg)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
|
|
|
}
|
2003-05-19 15:35:49 +02:00
|
|
|
#endif
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Delete_file_log_event ctor
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
Delete_file_log_event::Delete_file_log_event(const char* buf, uint len,
|
|
|
|
const Format_description_log_event* description_event)
|
|
|
|
:Log_event(buf, description_event),file_id(0)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
uint8 common_header_len= description_event->common_header_len;
|
|
|
|
uint8 delete_file_header_len= description_event->post_header_len[DELETE_FILE_EVENT-1];
|
|
|
|
if (len < (uint)(common_header_len + delete_file_header_len))
|
2002-10-30 07:50:07 +01:00
|
|
|
return;
|
2004-11-12 04:01:46 +01:00
|
|
|
file_id= uint4korr(buf + common_header_len + DF_FILE_ID_OFFSET);
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2004-11-12 04:01:46 +01:00
|
|
|
Delete_file_log_event::write()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2005-03-22 00:26:12 +01:00
|
|
|
#ifndef MYSQL_CLIENT
|
2004-11-12 04:01:46 +01:00
|
|
|
bool Delete_file_log_event::write(IO_CACHE* file)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar buf[DELETE_FILE_HEADER_LEN];
|
2002-10-30 07:50:07 +01:00
|
|
|
int4store(buf + DF_FILE_ID_OFFSET, file_id);
|
2004-11-12 04:01:46 +01:00
|
|
|
return (write_header(file, sizeof(buf)) ||
|
|
|
|
my_b_safe_write(file, buf, sizeof(buf)));
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
2005-03-22 00:26:12 +01:00
|
|
|
#endif
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Delete_file_log_event::print()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
#ifdef MYSQL_CLIENT
|
2005-10-12 23:37:21 +02:00
|
|
|
void Delete_file_log_event::print(FILE* file,
|
2005-10-19 19:31:24 +02:00
|
|
|
PRINT_EVENT_INFO* print_event_info)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
Write_on_release_cache cache(&print_event_info->head_cache, file);
|
|
|
|
|
2005-10-19 19:31:24 +02:00
|
|
|
if (print_event_info->short_form)
|
2002-10-30 07:50:07 +01:00
|
|
|
return;
|
2006-10-06 10:17:02 +02:00
|
|
|
print_header(&cache, print_event_info, FALSE);
|
|
|
|
my_b_printf(&cache, "\n#Delete_file: file_id=%u\n", file_id);
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
2003-08-11 21:44:43 +02:00
|
|
|
#endif /* MYSQL_CLIENT */
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Delete_file_log_event::pack_info()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2002-12-11 08:17:51 +01:00
|
|
|
void Delete_file_log_event::pack_info(Protocol *protocol)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
|
|
|
char buf[64];
|
|
|
|
uint length;
|
|
|
|
length= (uint) my_sprintf(buf, (buf, ";file_id=%u", (uint) file_id));
|
2003-03-18 08:34:19 +01:00
|
|
|
protocol->store(buf, (int32) length, &my_charset_bin);
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
2003-01-15 09:11:44 +01:00
|
|
|
#endif
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2006-11-10 15:10:41 +01:00
|
|
|
Delete_file_log_event::do_apply_event()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2007-08-16 07:37:50 +02:00
|
|
|
int Delete_file_log_event::do_apply_event(Relay_log_info const *rli)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
|
|
|
char fname[FN_REFLEN+10];
|
2006-01-05 23:47:49 +01:00
|
|
|
char *ext= slave_load_file_stem(fname, file_id, server_id, ".data");
|
2002-10-30 07:50:07 +01:00
|
|
|
(void) my_delete(fname, MYF(MY_WME));
|
2006-01-05 23:47:49 +01:00
|
|
|
strmov(ext, ".info");
|
2002-10-30 07:50:07 +01:00
|
|
|
(void) my_delete(fname, MYF(MY_WME));
|
2006-11-10 15:10:41 +01:00
|
|
|
return 0;
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
2003-08-29 12:44:35 +02:00
|
|
|
#endif /* defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) */
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
|
2003-05-21 20:39:58 +02:00
|
|
|
/**************************************************************************
|
2003-05-19 15:35:49 +02:00
|
|
|
Execute_load_log_event methods
|
2003-05-21 20:39:58 +02:00
|
|
|
**************************************************************************/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Execute_load_log_event ctor
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
#ifndef MYSQL_CLIENT
|
2007-08-14 14:20:05 +02:00
|
|
|
Execute_load_log_event::Execute_load_log_event(THD *thd_arg,
|
|
|
|
const char* db_arg,
|
2003-08-29 12:44:35 +02:00
|
|
|
bool using_trans)
|
|
|
|
:Log_event(thd_arg, 0, using_trans), file_id(thd_arg->file_id), db(db_arg)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
|
|
|
}
|
2003-05-19 15:35:49 +02:00
|
|
|
#endif
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Execute_load_log_event ctor
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
Execute_load_log_event::Execute_load_log_event(const char* buf, uint len,
|
|
|
|
const Format_description_log_event* description_event)
|
|
|
|
:Log_event(buf, description_event), file_id(0)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
uint8 common_header_len= description_event->common_header_len;
|
|
|
|
uint8 exec_load_header_len= description_event->post_header_len[EXEC_LOAD_EVENT-1];
|
|
|
|
if (len < (uint)(common_header_len+exec_load_header_len))
|
2002-10-30 07:50:07 +01:00
|
|
|
return;
|
2004-11-12 04:01:46 +01:00
|
|
|
file_id= uint4korr(buf + common_header_len + EL_FILE_ID_OFFSET);
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2004-11-12 04:01:46 +01:00
|
|
|
Execute_load_log_event::write()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2005-03-22 00:26:12 +01:00
|
|
|
#ifndef MYSQL_CLIENT
|
2004-11-12 04:01:46 +01:00
|
|
|
bool Execute_load_log_event::write(IO_CACHE* file)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar buf[EXEC_LOAD_HEADER_LEN];
|
2002-10-30 07:50:07 +01:00
|
|
|
int4store(buf + EL_FILE_ID_OFFSET, file_id);
|
2004-11-12 04:01:46 +01:00
|
|
|
return (write_header(file, sizeof(buf)) ||
|
|
|
|
my_b_safe_write(file, buf, sizeof(buf)));
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
2005-03-22 00:26:12 +01:00
|
|
|
#endif
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Execute_load_log_event::print()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
#ifdef MYSQL_CLIENT
|
2005-10-12 23:37:21 +02:00
|
|
|
void Execute_load_log_event::print(FILE* file,
|
2005-10-19 19:31:24 +02:00
|
|
|
PRINT_EVENT_INFO* print_event_info)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
Write_on_release_cache cache(&print_event_info->head_cache, file);
|
|
|
|
|
2005-10-19 19:31:24 +02:00
|
|
|
if (print_event_info->short_form)
|
2002-10-30 07:50:07 +01:00
|
|
|
return;
|
2006-10-06 10:17:02 +02:00
|
|
|
print_header(&cache, print_event_info, FALSE);
|
|
|
|
my_b_printf(&cache, "\n#Exec_load: file_id=%d\n",
|
|
|
|
file_id);
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
2003-05-19 15:35:49 +02:00
|
|
|
#endif
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
Execute_load_log_event::pack_info()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2002-12-11 08:17:51 +01:00
|
|
|
void Execute_load_log_event::pack_info(Protocol *protocol)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
|
|
|
char buf[64];
|
|
|
|
uint length;
|
|
|
|
length= (uint) my_sprintf(buf, (buf, ";file_id=%u", (uint) file_id));
|
2003-03-18 08:34:19 +01:00
|
|
|
protocol->store(buf, (int32) length, &my_charset_bin);
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2006-11-10 15:10:41 +01:00
|
|
|
Execute_load_log_event::do_apply_event()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2003-01-15 09:11:44 +01:00
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
int Execute_load_log_event::do_apply_event(Relay_log_info const *rli)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
|
|
|
char fname[FN_REFLEN+10];
|
2006-01-05 23:47:49 +01:00
|
|
|
char *ext;
|
2002-06-11 10:20:31 +02:00
|
|
|
int fd;
|
2006-01-05 23:47:49 +01:00
|
|
|
int error= 1;
|
2001-08-03 23:57:53 +02:00
|
|
|
IO_CACHE file;
|
2006-01-05 23:47:49 +01:00
|
|
|
Load_log_event *lev= 0;
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2006-01-05 23:47:49 +01:00
|
|
|
ext= slave_load_file_stem(fname, file_id, server_id, ".info");
|
2005-03-30 15:00:31 +02:00
|
|
|
if ((fd = my_open(fname, O_RDONLY | O_BINARY | O_NOFOLLOW,
|
|
|
|
MYF(MY_WME))) < 0 ||
|
2001-08-03 23:57:53 +02:00
|
|
|
init_io_cache(&file, fd, IO_SIZE, READ_CACHE, (my_off_t)0, 0,
|
|
|
|
MYF(MY_WME|MY_NABP)))
|
|
|
|
{
|
2007-06-09 07:19:37 +02:00
|
|
|
rli->report(ERROR_LEVEL, my_errno,
|
|
|
|
"Error in Exec_load event: could not open file '%s'",
|
|
|
|
fname);
|
2001-08-03 23:57:53 +02:00
|
|
|
goto err;
|
|
|
|
}
|
2001-11-11 06:24:12 +01:00
|
|
|
if (!(lev = (Load_log_event*)Log_event::read_log_event(&file,
|
2004-11-12 04:01:46 +01:00
|
|
|
(pthread_mutex_t*)0,
|
|
|
|
rli->relay_log.description_event_for_exec)) ||
|
2002-06-11 10:20:31 +02:00
|
|
|
lev->get_type_code() != NEW_LOAD_EVENT)
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2007-06-09 07:19:37 +02:00
|
|
|
rli->report(ERROR_LEVEL, 0, "Error in Exec_load event: "
|
2005-12-22 06:39:02 +01:00
|
|
|
"file '%s' appears corrupted", fname);
|
2001-08-03 23:57:53 +02:00
|
|
|
goto err;
|
|
|
|
}
|
2003-08-20 23:24:45 +02:00
|
|
|
|
2001-08-03 23:57:53 +02:00
|
|
|
lev->thd = thd;
|
2003-01-08 10:24:39 +01:00
|
|
|
/*
|
2006-11-10 15:10:41 +01:00
|
|
|
lev->do_apply_event should use rli only for errors i.e. should
|
2006-11-01 15:35:37 +01:00
|
|
|
not advance rli's position.
|
|
|
|
|
2006-11-10 15:10:41 +01:00
|
|
|
lev->do_apply_event is the place where the table is loaded (it
|
2006-11-01 15:35:37 +01:00
|
|
|
calls mysql_load()).
|
2003-01-08 10:24:39 +01:00
|
|
|
*/
|
2004-03-01 15:15:58 +01:00
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
const_cast<Relay_log_info*>(rli)->future_group_master_log_pos= log_pos;
|
2006-11-10 15:10:41 +01:00
|
|
|
if (lev->do_apply_event(0,rli,1))
|
2001-08-03 23:57:53 +02:00
|
|
|
{
|
2003-07-24 22:25:36 +02:00
|
|
|
/*
|
|
|
|
We want to indicate the name of the file that could not be loaded
|
|
|
|
(SQL_LOADxxx).
|
|
|
|
But as we are here we are sure the error is in rli->last_slave_error and
|
|
|
|
rli->last_slave_errno (example of error: duplicate entry for key), so we
|
|
|
|
don't want to overwrite it with the filename.
|
|
|
|
What we want instead is add the filename to the current error message.
|
|
|
|
*/
|
2007-06-11 22:15:39 +02:00
|
|
|
char *tmp= my_strdup(rli->last_error().message, MYF(MY_WME));
|
2003-08-07 19:16:37 +02:00
|
|
|
if (tmp)
|
|
|
|
{
|
2007-06-11 22:15:39 +02:00
|
|
|
rli->report(ERROR_LEVEL, rli->last_error().number,
|
2007-06-09 07:19:37 +02:00
|
|
|
"%s. Failed executing load from '%s'", tmp, fname);
|
2003-08-07 19:16:37 +02:00
|
|
|
my_free(tmp,MYF(0));
|
|
|
|
}
|
2001-08-03 23:57:53 +02:00
|
|
|
goto err;
|
|
|
|
}
|
2003-09-24 22:55:04 +02:00
|
|
|
/*
|
|
|
|
We have an open file descriptor to the .info file; we need to close it
|
|
|
|
or Windows will refuse to delete the file in my_delete().
|
|
|
|
*/
|
|
|
|
if (fd >= 0)
|
|
|
|
{
|
|
|
|
my_close(fd, MYF(0));
|
|
|
|
end_io_cache(&file);
|
|
|
|
fd= -1;
|
|
|
|
}
|
2002-06-11 10:20:31 +02:00
|
|
|
(void) my_delete(fname, MYF(MY_WME));
|
2006-01-05 23:47:49 +01:00
|
|
|
memcpy(ext, ".data", 6);
|
2002-06-11 10:20:31 +02:00
|
|
|
(void) my_delete(fname, MYF(MY_WME));
|
2001-08-03 23:57:53 +02:00
|
|
|
error = 0;
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2001-08-03 23:57:53 +02:00
|
|
|
err:
|
|
|
|
delete lev;
|
|
|
|
if (fd >= 0)
|
2002-06-11 10:20:31 +02:00
|
|
|
{
|
2001-08-03 23:57:53 +02:00
|
|
|
my_close(fd, MYF(0));
|
2002-06-11 10:20:31 +02:00
|
|
|
end_io_cache(&file);
|
|
|
|
}
|
2006-11-10 15:10:41 +01:00
|
|
|
return error;
|
2001-08-03 23:57:53 +02:00
|
|
|
}
|
2003-01-15 09:11:44 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
#endif /* defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) */
|
2002-10-30 07:50:07 +01:00
|
|
|
|
|
|
|
|
2005-03-16 02:32:47 +01:00
|
|
|
/**************************************************************************
|
|
|
|
Begin_load_query_log_event methods
|
|
|
|
**************************************************************************/
|
|
|
|
|
|
|
|
#ifndef MYSQL_CLIENT
|
|
|
|
Begin_load_query_log_event::
|
2008-01-30 16:03:00 +01:00
|
|
|
Begin_load_query_log_event(THD* thd_arg, const char* db_arg, uchar* block_arg,
|
2005-03-16 02:32:47 +01:00
|
|
|
uint block_len_arg, bool using_trans)
|
|
|
|
:Append_block_log_event(thd_arg, db_arg, block_arg, block_len_arg,
|
|
|
|
using_trans)
|
|
|
|
{
|
|
|
|
file_id= thd_arg->file_id= mysql_bin_log.next_file_id();
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
Begin_load_query_log_event::
|
|
|
|
Begin_load_query_log_event(const char* buf, uint len,
|
|
|
|
const Format_description_log_event* desc_event)
|
|
|
|
:Append_block_log_event(buf, len, desc_event)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#if defined( HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2005-03-25 14:51:17 +01:00
|
|
|
int Begin_load_query_log_event::get_create_or_append() const
|
2005-03-16 02:32:47 +01:00
|
|
|
{
|
2005-03-25 14:51:17 +01:00
|
|
|
return 1; /* create the file */
|
2005-03-16 02:32:47 +01:00
|
|
|
}
|
|
|
|
#endif /* defined( HAVE_REPLICATION) && !defined(MYSQL_CLIENT) */
|
|
|
|
|
|
|
|
|
2007-10-19 14:18:41 +02:00
|
|
|
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
|
|
|
|
Log_event::enum_skip_reason
|
|
|
|
Begin_load_query_log_event::do_shall_skip(Relay_log_info *rli)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
If the slave skip counter is 1, then we should not start executing
|
|
|
|
on the next event.
|
|
|
|
*/
|
|
|
|
return continue_group(rli);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2005-03-16 02:32:47 +01:00
|
|
|
/**************************************************************************
|
|
|
|
Execute_load_query_log_event methods
|
|
|
|
**************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef MYSQL_CLIENT
|
|
|
|
Execute_load_query_log_event::
|
2007-08-14 14:20:05 +02:00
|
|
|
Execute_load_query_log_event(THD *thd_arg, const char* query_arg,
|
2007-10-29 14:20:59 +01:00
|
|
|
ulong query_length_arg, uint fn_pos_start_arg,
|
|
|
|
uint fn_pos_end_arg,
|
|
|
|
enum_load_dup_handling dup_handling_arg,
|
|
|
|
bool using_trans, bool suppress_use,
|
|
|
|
THD::killed_state killed_err_arg):
|
2005-03-16 02:32:47 +01:00
|
|
|
Query_log_event(thd_arg, query_arg, query_length_arg, using_trans,
|
2007-10-29 14:20:59 +01:00
|
|
|
suppress_use, killed_err_arg),
|
2005-03-16 02:32:47 +01:00
|
|
|
file_id(thd_arg->file_id), fn_pos_start(fn_pos_start_arg),
|
|
|
|
fn_pos_end(fn_pos_end_arg), dup_handling(dup_handling_arg)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif /* !MYSQL_CLIENT */
|
|
|
|
|
|
|
|
|
|
|
|
Execute_load_query_log_event::
|
|
|
|
Execute_load_query_log_event(const char* buf, uint event_len,
|
|
|
|
const Format_description_log_event* desc_event):
|
|
|
|
Query_log_event(buf, event_len, desc_event, EXECUTE_LOAD_QUERY_EVENT),
|
|
|
|
file_id(0), fn_pos_start(0), fn_pos_end(0)
|
|
|
|
{
|
|
|
|
if (!Query_log_event::is_valid())
|
|
|
|
return;
|
|
|
|
|
|
|
|
buf+= desc_event->common_header_len;
|
|
|
|
|
|
|
|
fn_pos_start= uint4korr(buf + ELQ_FN_POS_START_OFFSET);
|
|
|
|
fn_pos_end= uint4korr(buf + ELQ_FN_POS_END_OFFSET);
|
|
|
|
dup_handling= (enum_load_dup_handling)(*(buf + ELQ_DUP_HANDLING_OFFSET));
|
|
|
|
|
|
|
|
if (fn_pos_start > q_len || fn_pos_end > q_len ||
|
|
|
|
dup_handling > LOAD_DUP_REPLACE)
|
|
|
|
return;
|
|
|
|
|
|
|
|
file_id= uint4korr(buf + ELQ_FILE_ID_OFFSET);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
ulong Execute_load_query_log_event::get_post_header_size_for_derived()
|
|
|
|
{
|
|
|
|
return EXECUTE_LOAD_QUERY_EXTRA_HEADER_LEN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-03-22 00:26:12 +01:00
|
|
|
#ifndef MYSQL_CLIENT
|
2005-03-16 02:32:47 +01:00
|
|
|
bool
|
|
|
|
Execute_load_query_log_event::write_post_header_for_derived(IO_CACHE* 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 buf[EXECUTE_LOAD_QUERY_EXTRA_HEADER_LEN];
|
2005-03-16 02:32:47 +01:00
|
|
|
int4store(buf, file_id);
|
|
|
|
int4store(buf + 4, fn_pos_start);
|
|
|
|
int4store(buf + 4 + 4, fn_pos_end);
|
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
|
|
|
*(buf + 4 + 4 + 4)= (uchar) dup_handling;
|
|
|
|
return my_b_safe_write(file, buf, EXECUTE_LOAD_QUERY_EXTRA_HEADER_LEN);
|
2005-03-16 02:32:47 +01:00
|
|
|
}
|
2005-03-22 00:26:12 +01:00
|
|
|
#endif
|
2005-03-16 02:32:47 +01:00
|
|
|
|
|
|
|
|
|
|
|
#ifdef MYSQL_CLIENT
|
2005-10-12 23:37:21 +02:00
|
|
|
void Execute_load_query_log_event::print(FILE* file,
|
2005-10-19 19:31:24 +02:00
|
|
|
PRINT_EVENT_INFO* print_event_info)
|
2005-03-16 02:32:47 +01:00
|
|
|
{
|
2005-10-19 19:31:24 +02:00
|
|
|
print(file, print_event_info, 0);
|
2005-03-16 02:32:47 +01:00
|
|
|
}
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
Prints the query as LOAD DATA LOCAL and with rewritten filename.
|
|
|
|
*/
|
2005-10-12 23:37:21 +02:00
|
|
|
void Execute_load_query_log_event::print(FILE* file,
|
2005-10-19 19:31:24 +02:00
|
|
|
PRINT_EVENT_INFO* print_event_info,
|
2005-03-16 02:32:47 +01:00
|
|
|
const char *local_fname)
|
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
Write_on_release_cache cache(&print_event_info->head_cache, file);
|
|
|
|
|
|
|
|
print_query_header(&cache, print_event_info);
|
2005-03-16 02:32:47 +01:00
|
|
|
|
|
|
|
if (local_fname)
|
|
|
|
{
|
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_b_write(&cache, (uchar*) query, fn_pos_start);
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(&cache, " LOCAL INFILE \'");
|
|
|
|
my_b_printf(&cache, local_fname);
|
|
|
|
my_b_printf(&cache, "\'");
|
2005-03-16 02:32:47 +01:00
|
|
|
if (dup_handling == LOAD_DUP_REPLACE)
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(&cache, " REPLACE");
|
2009-03-16 09:21:29 +01:00
|
|
|
my_b_printf(&cache, " INTO ");
|
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_b_write(&cache, (uchar*) query + fn_pos_end, q_len-fn_pos_end);
|
2007-12-17 14:13:25 +01:00
|
|
|
my_b_printf(&cache, "\n%s\n", print_event_info->delimiter);
|
2005-03-16 02:32:47 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
my_b_write(&cache, (uchar*) query, q_len);
|
2007-12-17 14:13:25 +01:00
|
|
|
my_b_printf(&cache, "\n%s\n", print_event_info->delimiter);
|
2005-03-16 02:32:47 +01:00
|
|
|
}
|
|
|
|
|
2005-10-19 19:31:24 +02:00
|
|
|
if (!print_event_info->short_form)
|
2006-10-06 10:17:02 +02:00
|
|
|
my_b_printf(&cache, "# file_id: %d \n", file_id);
|
2005-03-16 02:32:47 +01:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
|
|
|
void Execute_load_query_log_event::pack_info(Protocol *protocol)
|
|
|
|
{
|
|
|
|
char *buf, *pos;
|
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 (!(buf= (char*) my_malloc(9 + db_len + q_len + 10 + 21, MYF(MY_WME))))
|
2005-03-16 02:32:47 +01:00
|
|
|
return;
|
|
|
|
pos= buf;
|
|
|
|
if (db && db_len)
|
|
|
|
{
|
|
|
|
pos= strmov(buf, "use `");
|
|
|
|
memcpy(pos, db, db_len);
|
|
|
|
pos= strmov(pos+db_len, "`; ");
|
|
|
|
}
|
|
|
|
if (query && q_len)
|
|
|
|
{
|
|
|
|
memcpy(pos, query, q_len);
|
|
|
|
pos+= q_len;
|
|
|
|
}
|
|
|
|
pos= strmov(pos, " ;file_id=");
|
|
|
|
pos= int10_to_str((long) file_id, pos, 10);
|
|
|
|
protocol->store(buf, pos-buf, &my_charset_bin);
|
|
|
|
my_free(buf, MYF(MY_ALLOW_ZERO_PTR));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int
|
2007-08-16 07:37:50 +02:00
|
|
|
Execute_load_query_log_event::do_apply_event(Relay_log_info const *rli)
|
2005-03-16 02:32:47 +01:00
|
|
|
{
|
|
|
|
char *p;
|
|
|
|
char *buf;
|
|
|
|
char *fname;
|
|
|
|
char *fname_end;
|
|
|
|
int error;
|
|
|
|
|
2007-06-09 08:29:51 +02:00
|
|
|
buf= (char*) my_malloc(q_len + 1 - (fn_pos_end - fn_pos_start) +
|
|
|
|
(FN_REFLEN + 10) + 10 + 8 + 5, MYF(MY_WME));
|
2007-06-09 07:19:37 +02:00
|
|
|
|
2007-06-13 15:16:33 +02:00
|
|
|
DBUG_EXECUTE_IF("LOAD_DATA_INFILE_has_fatal_error", my_free(buf, MYF(0)); buf= NULL;);
|
2007-06-09 07:19:37 +02:00
|
|
|
|
2005-03-16 02:32:47 +01:00
|
|
|
/* Replace filename and LOCAL keyword in query before executing it */
|
2007-06-09 07:19:37 +02:00
|
|
|
if (buf == NULL)
|
2005-03-16 02:32:47 +01:00
|
|
|
{
|
2007-06-09 07:19:37 +02:00
|
|
|
rli->report(ERROR_LEVEL, ER_SLAVE_FATAL_ERROR,
|
|
|
|
ER(ER_SLAVE_FATAL_ERROR), "Not enough memory");
|
2005-03-16 02:32:47 +01:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
p= buf;
|
|
|
|
memcpy(p, query, fn_pos_start);
|
|
|
|
p+= fn_pos_start;
|
2005-11-20 19:47:07 +01:00
|
|
|
fname= (p= strmake(p, STRING_WITH_LEN(" INFILE \'")));
|
2006-01-05 23:47:49 +01:00
|
|
|
p= slave_load_file_stem(p, file_id, server_id, ".data");
|
|
|
|
fname_end= p= strend(p); // Safer than p=p+5
|
2005-03-16 02:32:47 +01:00
|
|
|
*(p++)='\'';
|
2006-01-05 23:47:49 +01:00
|
|
|
switch (dup_handling) {
|
2005-03-16 02:32:47 +01:00
|
|
|
case LOAD_DUP_IGNORE:
|
2005-11-20 19:47:07 +01:00
|
|
|
p= strmake(p, STRING_WITH_LEN(" IGNORE"));
|
2005-03-16 02:32:47 +01:00
|
|
|
break;
|
|
|
|
case LOAD_DUP_REPLACE:
|
2005-11-20 19:47:07 +01:00
|
|
|
p= strmake(p, STRING_WITH_LEN(" REPLACE"));
|
2005-03-16 02:32:47 +01:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* Ordinary load data */
|
|
|
|
break;
|
|
|
|
}
|
2009-03-16 09:21:29 +01:00
|
|
|
p= strmake(p, STRING_WITH_LEN(" INTO "));
|
2005-03-16 02:32:47 +01:00
|
|
|
p= strmake(p, query+fn_pos_end, q_len-fn_pos_end);
|
|
|
|
|
2006-11-10 15:10:41 +01:00
|
|
|
error= Query_log_event::do_apply_event(rli, buf, p-buf);
|
2005-03-16 02:32:47 +01:00
|
|
|
|
|
|
|
/* Forging file name for deletion in same buffer */
|
|
|
|
*fname_end= 0;
|
|
|
|
|
2005-03-25 14:51:17 +01:00
|
|
|
/*
|
|
|
|
If there was an error the slave is going to stop, leave the
|
|
|
|
file so that we can re-execute this event at START SLAVE.
|
|
|
|
*/
|
|
|
|
if (!error)
|
|
|
|
(void) my_delete(fname, MYF(MY_WME));
|
2005-03-16 02:32:47 +01:00
|
|
|
|
|
|
|
my_free(buf, MYF(MY_ALLOW_ZERO_PTR));
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2003-05-21 20:39:58 +02:00
|
|
|
/**************************************************************************
|
2003-05-19 15:35:49 +02:00
|
|
|
sql_ex_info methods
|
2003-05-21 20:39:58 +02:00
|
|
|
**************************************************************************/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
sql_ex_info::write_data()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
bool sql_ex_info::write_data(IO_CACHE* file)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
|
|
|
if (new_format())
|
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
return (write_str(file, field_term, (uint) field_term_len) ||
|
|
|
|
write_str(file, enclosed, (uint) enclosed_len) ||
|
|
|
|
write_str(file, line_term, (uint) line_term_len) ||
|
|
|
|
write_str(file, line_start, (uint) line_start_len) ||
|
|
|
|
write_str(file, escaped, (uint) escaped_len) ||
|
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_b_safe_write(file,(uchar*) &opt_flags,1));
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2007-10-25 11:58:18 +02:00
|
|
|
/**
|
|
|
|
@todo This is sensitive to field padding. We should write a
|
|
|
|
char[7], not an old_sql_ex. /sven
|
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
old_sql_ex old_ex;
|
|
|
|
old_ex.field_term= *field_term;
|
|
|
|
old_ex.enclosed= *enclosed;
|
|
|
|
old_ex.line_term= *line_term;
|
|
|
|
old_ex.line_start= *line_start;
|
|
|
|
old_ex.escaped= *escaped;
|
|
|
|
old_ex.opt_flags= opt_flags;
|
|
|
|
old_ex.empty_flags=empty_flags;
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
return my_b_safe_write(file, (uchar*) &old_ex, sizeof(old_ex)) != 0;
|
2002-10-30 07:50:07 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-05-19 15:35:49 +02:00
|
|
|
/*
|
2002-10-30 07:50:07 +01:00
|
|
|
sql_ex_info::init()
|
2003-05-19 15:35:49 +02:00
|
|
|
*/
|
2002-10-30 07:50:07 +01:00
|
|
|
|
2008-01-30 14:12:40 +01:00
|
|
|
const char *sql_ex_info::init(const char *buf, const char *buf_end,
|
|
|
|
bool use_new_format)
|
2002-10-30 07:50:07 +01:00
|
|
|
{
|
|
|
|
cached_new_format = use_new_format;
|
|
|
|
if (use_new_format)
|
|
|
|
{
|
|
|
|
empty_flags=0;
|
|
|
|
/*
|
|
|
|
The code below assumes that buf will not disappear from
|
|
|
|
under our feet during the lifetime of the event. This assumption
|
|
|
|
holds true in the slave thread if the log is in new format, but is not
|
|
|
|
the case when we have old format because we will be reusing net buffer
|
|
|
|
to read the actual file before we write out the Create_file event.
|
|
|
|
*/
|
2008-01-30 14:12:40 +01:00
|
|
|
if (read_str(&buf, buf_end, &field_term, &field_term_len) ||
|
|
|
|
read_str(&buf, buf_end, &enclosed, &enclosed_len) ||
|
|
|
|
read_str(&buf, buf_end, &line_term, &line_term_len) ||
|
|
|
|
read_str(&buf, buf_end, &line_start, &line_start_len) ||
|
|
|
|
read_str(&buf, buf_end, &escaped, &escaped_len))
|
2002-10-30 07:50:07 +01:00
|
|
|
return 0;
|
|
|
|
opt_flags = *buf++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
field_term_len= enclosed_len= line_term_len= line_start_len= escaped_len=1;
|
|
|
|
field_term = buf++; // Use first byte in string
|
|
|
|
enclosed= buf++;
|
|
|
|
line_term= buf++;
|
|
|
|
line_start= buf++;
|
|
|
|
escaped= buf++;
|
|
|
|
opt_flags = *buf++;
|
|
|
|
empty_flags= *buf++;
|
|
|
|
if (empty_flags & FIELD_TERM_EMPTY)
|
|
|
|
field_term_len=0;
|
|
|
|
if (empty_flags & ENCLOSED_EMPTY)
|
|
|
|
enclosed_len=0;
|
|
|
|
if (empty_flags & LINE_TERM_EMPTY)
|
|
|
|
line_term_len=0;
|
|
|
|
if (empty_flags & LINE_START_EMPTY)
|
|
|
|
line_start_len=0;
|
|
|
|
if (empty_flags & ESCAPED_EMPTY)
|
|
|
|
escaped_len=0;
|
|
|
|
}
|
|
|
|
return buf;
|
|
|
|
}
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
|
|
|
|
/**************************************************************************
|
|
|
|
Rows_log_event member functions
|
|
|
|
**************************************************************************/
|
|
|
|
|
|
|
|
#ifndef MYSQL_CLIENT
|
|
|
|
Rows_log_event::Rows_log_event(THD *thd_arg, TABLE *tbl_arg, ulong tid,
|
|
|
|
MY_BITMAP const *cols, bool is_transactional)
|
|
|
|
: Log_event(thd_arg, 0, is_transactional),
|
2006-02-16 08:30:53 +01:00
|
|
|
m_row_count(0),
|
2005-12-22 06:39:02 +01:00
|
|
|
m_table(tbl_arg),
|
|
|
|
m_table_id(tid),
|
2006-02-16 08:30:53 +01:00
|
|
|
m_width(tbl_arg ? tbl_arg->s->fields : 1),
|
2007-08-28 10:14:45 +02:00
|
|
|
m_rows_buf(0), m_rows_cur(0), m_rows_end(0), m_flags(0)
|
|
|
|
#ifdef HAVE_REPLICATION
|
2007-10-19 23:20:38 +02:00
|
|
|
, m_curr_row(NULL), m_curr_row_end(NULL), m_key(NULL)
|
2007-08-28 10:14:45 +02:00
|
|
|
#endif
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
2006-02-16 08:30:53 +01:00
|
|
|
/*
|
|
|
|
We allow a special form of dummy event when the table, and cols
|
2006-03-09 03:56:14 +01:00
|
|
|
are null and the table id is ~0UL. This is a temporary
|
2006-03-08 21:49:49 +01:00
|
|
|
solution, to be able to terminate a started statement in the
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
binary log: the extraneous events will be removed in the future.
|
2006-02-16 08:30:53 +01:00
|
|
|
*/
|
2006-03-09 03:56:14 +01:00
|
|
|
DBUG_ASSERT(tbl_arg && tbl_arg->s && tid != ~0UL ||
|
|
|
|
!tbl_arg && !cols && tid == ~0UL);
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
if (thd_arg->options & OPTION_NO_FOREIGN_KEY_CHECKS)
|
|
|
|
set_flags(NO_FOREIGN_KEY_CHECKS_F);
|
|
|
|
if (thd_arg->options & OPTION_RELAXED_UNIQUE_CHECKS)
|
|
|
|
set_flags(RELAXED_UNIQUE_CHECKS_F);
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
/* if bitmap_init fails, caught in is_valid() */
|
2005-12-22 06:39:02 +01:00
|
|
|
if (likely(!bitmap_init(&m_cols,
|
|
|
|
m_width <= sizeof(m_bitbuf)*8 ? m_bitbuf : NULL,
|
Bug#19259 rpl_ndb_dd_partitions failed on Solaris
Actually, this testcase will fail generally on all testing platforms.
The bugs come from the inconsistent bitmap between rpl master and slave.
In log_event.cc, the n_bits of m_cols and m_cols_ai are intialized with octal-ceiling
m_width, in fact, their n_bits should be equal to m_width.
Wrong n_bits will cause bitmap_bits_set() get incorrect value in unpack_row()
in rpl_record.cc,
then an assertion in unpack_row() will fail and crash sql thread.
DBUG_ASSERT(null_ptr == row_data + master_null_byte_count);
Meanwhile, because of binlog_prepare_pending_rows_event() changed with correct
m_cols, some results of specific testcases should be updated:
binlog_multi_engine.test
ndb_binlog_multi.test
rpl_ndb_dd_partitions.test
rpl_ndb_log.test
rpl_truncate_7ndb.test
rpl_truncate_7ndb_2.test
In addition, to ensure rows replication correct between master and slave after the patch,
two 'select * from t1' are added in extra/rpl_tests/rpl_log.test, and some testcases include
rpl_log.test, therefore, the results of these testcases should be updated likewise:
rpl_stm_log.test
rpl_row_log.test
rpl_ndb_log.test
rpl_row_log_innodb.test
Totally, results of nine testcases are updated.
2007-07-12 09:19:29 +02:00
|
|
|
m_width,
|
2005-12-22 06:39:02 +01:00
|
|
|
false)))
|
2006-02-16 08:30:53 +01:00
|
|
|
{
|
|
|
|
/* Cols can be zero if this is a dummy binrows event */
|
|
|
|
if (likely(cols != NULL))
|
Bug#19259 rpl_ndb_dd_partitions failed on Solaris
Actually, this testcase will fail generally on all testing platforms.
The bugs come from the inconsistent bitmap between rpl master and slave.
In log_event.cc, the n_bits of m_cols and m_cols_ai are intialized with octal-ceiling
m_width, in fact, their n_bits should be equal to m_width.
Wrong n_bits will cause bitmap_bits_set() get incorrect value in unpack_row()
in rpl_record.cc,
then an assertion in unpack_row() will fail and crash sql thread.
DBUG_ASSERT(null_ptr == row_data + master_null_byte_count);
Meanwhile, because of binlog_prepare_pending_rows_event() changed with correct
m_cols, some results of specific testcases should be updated:
binlog_multi_engine.test
ndb_binlog_multi.test
rpl_ndb_dd_partitions.test
rpl_ndb_log.test
rpl_truncate_7ndb.test
rpl_truncate_7ndb_2.test
In addition, to ensure rows replication correct between master and slave after the patch,
two 'select * from t1' are added in extra/rpl_tests/rpl_log.test, and some testcases include
rpl_log.test, therefore, the results of these testcases should be updated likewise:
rpl_stm_log.test
rpl_row_log.test
rpl_ndb_log.test
rpl_row_log_innodb.test
Totally, results of nine testcases are updated.
2007-07-12 09:19:29 +02:00
|
|
|
{
|
2006-02-16 08:30:53 +01:00
|
|
|
memcpy(m_cols.bitmap, cols->bitmap, no_bytes_in_map(cols));
|
Bug#19259 rpl_ndb_dd_partitions failed on Solaris
Actually, this testcase will fail generally on all testing platforms.
The bugs come from the inconsistent bitmap between rpl master and slave.
In log_event.cc, the n_bits of m_cols and m_cols_ai are intialized with octal-ceiling
m_width, in fact, their n_bits should be equal to m_width.
Wrong n_bits will cause bitmap_bits_set() get incorrect value in unpack_row()
in rpl_record.cc,
then an assertion in unpack_row() will fail and crash sql thread.
DBUG_ASSERT(null_ptr == row_data + master_null_byte_count);
Meanwhile, because of binlog_prepare_pending_rows_event() changed with correct
m_cols, some results of specific testcases should be updated:
binlog_multi_engine.test
ndb_binlog_multi.test
rpl_ndb_dd_partitions.test
rpl_ndb_log.test
rpl_truncate_7ndb.test
rpl_truncate_7ndb_2.test
In addition, to ensure rows replication correct between master and slave after the patch,
two 'select * from t1' are added in extra/rpl_tests/rpl_log.test, and some testcases include
rpl_log.test, therefore, the results of these testcases should be updated likewise:
rpl_stm_log.test
rpl_row_log.test
rpl_ndb_log.test
rpl_row_log_innodb.test
Totally, results of nine testcases are updated.
2007-07-12 09:19:29 +02:00
|
|
|
create_last_word_mask(&m_cols);
|
|
|
|
}
|
2006-02-16 08:30:53 +01:00
|
|
|
}
|
2005-12-22 06:39:02 +01:00
|
|
|
else
|
2007-03-27 12:17:51 +02:00
|
|
|
{
|
|
|
|
// Needed because bitmap_init() does not set it to null on failure
|
|
|
|
m_cols.bitmap= 0;
|
|
|
|
}
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
Rows_log_event::Rows_log_event(const char *buf, uint event_len,
|
|
|
|
Log_event_type event_type,
|
|
|
|
const Format_description_log_event
|
|
|
|
*description_event)
|
|
|
|
: Log_event(buf, description_event),
|
2006-02-16 08:30:53 +01:00
|
|
|
m_row_count(0),
|
2007-08-28 10:14:45 +02:00
|
|
|
#ifndef MYSQL_CLIENT
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
m_table(NULL),
|
2007-08-28 10:14:45 +02:00
|
|
|
#endif
|
|
|
|
m_table_id(0), m_rows_buf(0), m_rows_cur(0), m_rows_end(0)
|
|
|
|
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
|
2007-10-19 23:20:38 +02:00
|
|
|
, m_curr_row(NULL), m_curr_row_end(NULL), m_key(NULL)
|
2007-08-28 10:14:45 +02:00
|
|
|
#endif
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
|
|
|
DBUG_ENTER("Rows_log_event::Rows_log_event(const char*,...)");
|
|
|
|
uint8 const common_header_len= description_event->common_header_len;
|
|
|
|
uint8 const post_header_len= description_event->post_header_len[event_type-1];
|
|
|
|
|
2006-11-27 00:47:38 +01:00
|
|
|
DBUG_PRINT("enter",("event_len: %u common_header_len: %d "
|
|
|
|
"post_header_len: %d",
|
2005-12-22 06:39:02 +01:00
|
|
|
event_len, common_header_len,
|
|
|
|
post_header_len));
|
|
|
|
|
|
|
|
const char *post_start= buf + common_header_len;
|
|
|
|
post_start+= RW_MAPID_OFFSET;
|
|
|
|
if (post_header_len == 6)
|
|
|
|
{
|
|
|
|
/* Master is of an intermediate source tree before 5.1.4. Id is 4 bytes */
|
|
|
|
m_table_id= uint4korr(post_start);
|
|
|
|
post_start+= 4;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2006-11-30 02:40:42 +01:00
|
|
|
m_table_id= (ulong) uint6korr(post_start);
|
2005-12-22 06:39:02 +01:00
|
|
|
post_start+= RW_FLAGS_OFFSET;
|
|
|
|
}
|
|
|
|
|
|
|
|
m_flags= uint2korr(post_start);
|
|
|
|
|
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 const *const var_start=
|
|
|
|
(const uchar *)buf + common_header_len + post_header_len;
|
|
|
|
uchar const *const ptr_width= var_start;
|
2006-02-23 22:19:47 +01:00
|
|
|
uchar *ptr_after_width= (uchar*) ptr_width;
|
2007-03-27 12:17:51 +02:00
|
|
|
DBUG_PRINT("debug", ("Reading from %p", ptr_after_width));
|
2006-02-23 22:19:47 +01:00
|
|
|
m_width = net_field_length(&ptr_after_width);
|
2007-03-27 12:17:51 +02:00
|
|
|
DBUG_PRINT("debug", ("m_width=%lu", m_width));
|
|
|
|
/* if bitmap_init fails, catched in is_valid() */
|
|
|
|
if (likely(!bitmap_init(&m_cols,
|
|
|
|
m_width <= sizeof(m_bitbuf)*8 ? m_bitbuf : NULL,
|
Bug#19259 rpl_ndb_dd_partitions failed on Solaris
Actually, this testcase will fail generally on all testing platforms.
The bugs come from the inconsistent bitmap between rpl master and slave.
In log_event.cc, the n_bits of m_cols and m_cols_ai are intialized with octal-ceiling
m_width, in fact, their n_bits should be equal to m_width.
Wrong n_bits will cause bitmap_bits_set() get incorrect value in unpack_row()
in rpl_record.cc,
then an assertion in unpack_row() will fail and crash sql thread.
DBUG_ASSERT(null_ptr == row_data + master_null_byte_count);
Meanwhile, because of binlog_prepare_pending_rows_event() changed with correct
m_cols, some results of specific testcases should be updated:
binlog_multi_engine.test
ndb_binlog_multi.test
rpl_ndb_dd_partitions.test
rpl_ndb_log.test
rpl_truncate_7ndb.test
rpl_truncate_7ndb_2.test
In addition, to ensure rows replication correct between master and slave after the patch,
two 'select * from t1' are added in extra/rpl_tests/rpl_log.test, and some testcases include
rpl_log.test, therefore, the results of these testcases should be updated likewise:
rpl_stm_log.test
rpl_row_log.test
rpl_ndb_log.test
rpl_row_log_innodb.test
Totally, results of nine testcases are updated.
2007-07-12 09:19:29 +02:00
|
|
|
m_width,
|
2007-03-27 12:17:51 +02:00
|
|
|
false)))
|
|
|
|
{
|
|
|
|
DBUG_PRINT("debug", ("Reading from %p", ptr_after_width));
|
|
|
|
memcpy(m_cols.bitmap, ptr_after_width, (m_width + 7) / 8);
|
Bug#19259 rpl_ndb_dd_partitions failed on Solaris
Actually, this testcase will fail generally on all testing platforms.
The bugs come from the inconsistent bitmap between rpl master and slave.
In log_event.cc, the n_bits of m_cols and m_cols_ai are intialized with octal-ceiling
m_width, in fact, their n_bits should be equal to m_width.
Wrong n_bits will cause bitmap_bits_set() get incorrect value in unpack_row()
in rpl_record.cc,
then an assertion in unpack_row() will fail and crash sql thread.
DBUG_ASSERT(null_ptr == row_data + master_null_byte_count);
Meanwhile, because of binlog_prepare_pending_rows_event() changed with correct
m_cols, some results of specific testcases should be updated:
binlog_multi_engine.test
ndb_binlog_multi.test
rpl_ndb_dd_partitions.test
rpl_ndb_log.test
rpl_truncate_7ndb.test
rpl_truncate_7ndb_2.test
In addition, to ensure rows replication correct between master and slave after the patch,
two 'select * from t1' are added in extra/rpl_tests/rpl_log.test, and some testcases include
rpl_log.test, therefore, the results of these testcases should be updated likewise:
rpl_stm_log.test
rpl_row_log.test
rpl_ndb_log.test
rpl_row_log_innodb.test
Totally, results of nine testcases are updated.
2007-07-12 09:19:29 +02:00
|
|
|
create_last_word_mask(&m_cols);
|
2007-03-27 12:17:51 +02:00
|
|
|
ptr_after_width+= (m_width + 7) / 8;
|
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
|
|
|
DBUG_DUMP("m_cols", (uchar*) m_cols.bitmap, no_bytes_in_map(&m_cols));
|
2007-03-27 12:17:51 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Needed because bitmap_init() does not set it to null on failure
|
|
|
|
m_cols.bitmap= NULL;
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
2005-12-22 06:39:02 +01:00
|
|
|
|
2007-03-27 12:17:51 +02:00
|
|
|
m_cols_ai.bitmap= m_cols.bitmap; /* See explanation in is_valid() */
|
|
|
|
|
|
|
|
if (event_type == UPDATE_ROWS_EVENT)
|
|
|
|
{
|
|
|
|
DBUG_PRINT("debug", ("Reading from %p", ptr_after_width));
|
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
/* if bitmap_init fails, caught in is_valid() */
|
2007-03-27 12:17:51 +02:00
|
|
|
if (likely(!bitmap_init(&m_cols_ai,
|
|
|
|
m_width <= sizeof(m_bitbuf_ai)*8 ? m_bitbuf_ai : NULL,
|
Bug#19259 rpl_ndb_dd_partitions failed on Solaris
Actually, this testcase will fail generally on all testing platforms.
The bugs come from the inconsistent bitmap between rpl master and slave.
In log_event.cc, the n_bits of m_cols and m_cols_ai are intialized with octal-ceiling
m_width, in fact, their n_bits should be equal to m_width.
Wrong n_bits will cause bitmap_bits_set() get incorrect value in unpack_row()
in rpl_record.cc,
then an assertion in unpack_row() will fail and crash sql thread.
DBUG_ASSERT(null_ptr == row_data + master_null_byte_count);
Meanwhile, because of binlog_prepare_pending_rows_event() changed with correct
m_cols, some results of specific testcases should be updated:
binlog_multi_engine.test
ndb_binlog_multi.test
rpl_ndb_dd_partitions.test
rpl_ndb_log.test
rpl_truncate_7ndb.test
rpl_truncate_7ndb_2.test
In addition, to ensure rows replication correct between master and slave after the patch,
two 'select * from t1' are added in extra/rpl_tests/rpl_log.test, and some testcases include
rpl_log.test, therefore, the results of these testcases should be updated likewise:
rpl_stm_log.test
rpl_row_log.test
rpl_ndb_log.test
rpl_row_log_innodb.test
Totally, results of nine testcases are updated.
2007-07-12 09:19:29 +02:00
|
|
|
m_width,
|
2007-03-27 12:17:51 +02:00
|
|
|
false)))
|
|
|
|
{
|
|
|
|
DBUG_PRINT("debug", ("Reading from %p", ptr_after_width));
|
|
|
|
memcpy(m_cols_ai.bitmap, ptr_after_width, (m_width + 7) / 8);
|
Bug#19259 rpl_ndb_dd_partitions failed on Solaris
Actually, this testcase will fail generally on all testing platforms.
The bugs come from the inconsistent bitmap between rpl master and slave.
In log_event.cc, the n_bits of m_cols and m_cols_ai are intialized with octal-ceiling
m_width, in fact, their n_bits should be equal to m_width.
Wrong n_bits will cause bitmap_bits_set() get incorrect value in unpack_row()
in rpl_record.cc,
then an assertion in unpack_row() will fail and crash sql thread.
DBUG_ASSERT(null_ptr == row_data + master_null_byte_count);
Meanwhile, because of binlog_prepare_pending_rows_event() changed with correct
m_cols, some results of specific testcases should be updated:
binlog_multi_engine.test
ndb_binlog_multi.test
rpl_ndb_dd_partitions.test
rpl_ndb_log.test
rpl_truncate_7ndb.test
rpl_truncate_7ndb_2.test
In addition, to ensure rows replication correct between master and slave after the patch,
two 'select * from t1' are added in extra/rpl_tests/rpl_log.test, and some testcases include
rpl_log.test, therefore, the results of these testcases should be updated likewise:
rpl_stm_log.test
rpl_row_log.test
rpl_ndb_log.test
rpl_row_log_innodb.test
Totally, results of nine testcases are updated.
2007-07-12 09:19:29 +02:00
|
|
|
create_last_word_mask(&m_cols_ai);
|
2007-03-27 12:17:51 +02:00
|
|
|
ptr_after_width+= (m_width + 7) / 8;
|
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
|
|
|
DBUG_DUMP("m_cols_ai", (uchar*) m_cols_ai.bitmap,
|
|
|
|
no_bytes_in_map(&m_cols_ai));
|
2007-03-27 12:17:51 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Needed because bitmap_init() does not set it to null on failure
|
|
|
|
m_cols_ai.bitmap= 0;
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
const uchar* const ptr_rows_data= (const uchar*) ptr_after_width;
|
2005-12-22 06:39:02 +01:00
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
size_t const data_size= event_len - (ptr_rows_data - (const uchar *) buf);
|
2006-11-27 17:16:08 +01:00
|
|
|
DBUG_PRINT("info",("m_table_id: %lu m_flags: %d m_width: %lu data_size: %lu",
|
2007-06-11 22:15:39 +02:00
|
|
|
m_table_id, m_flags, m_width, (ulong) data_size));
|
2005-12-22 06:39:02 +01:00
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
m_rows_buf= (uchar*) my_malloc(data_size, MYF(MY_WME));
|
2005-12-22 06:39:02 +01:00
|
|
|
if (likely((bool)m_rows_buf))
|
|
|
|
{
|
2007-08-28 10:14:45 +02:00
|
|
|
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
m_curr_row= m_rows_buf;
|
2007-08-28 10:14:45 +02:00
|
|
|
#endif
|
2005-12-22 06:39:02 +01:00
|
|
|
m_rows_end= m_rows_buf + data_size;
|
|
|
|
m_rows_cur= m_rows_end;
|
|
|
|
memcpy(m_rows_buf, ptr_rows_data, data_size);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
m_cols.bitmap= 0; // to not free it
|
|
|
|
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
Rows_log_event::~Rows_log_event()
|
|
|
|
{
|
|
|
|
if (m_cols.bitmap == m_bitbuf) // no my_malloc happened
|
|
|
|
m_cols.bitmap= 0; // so no my_free in bitmap_free
|
|
|
|
bitmap_free(&m_cols); // To pair with bitmap_init().
|
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*)m_rows_buf, MYF(MY_ALLOW_ZERO_PTR));
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
|
2007-03-27 12:17:51 +02:00
|
|
|
int Rows_log_event::get_data_size()
|
|
|
|
{
|
|
|
|
int const type_code= get_type_code();
|
|
|
|
|
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 buf[sizeof(m_width)+1];
|
|
|
|
uchar *end= net_store_length(buf, (m_width + 7) / 8);
|
2007-03-27 12:17:51 +02:00
|
|
|
|
|
|
|
DBUG_EXECUTE_IF("old_row_based_repl_4_byte_map_id_master",
|
|
|
|
return 6 + no_bytes_in_map(&m_cols) + (end - buf) +
|
|
|
|
(type_code == UPDATE_ROWS_EVENT ? no_bytes_in_map(&m_cols_ai) : 0) +
|
|
|
|
(m_rows_cur - m_rows_buf););
|
|
|
|
int data_size= ROWS_HEADER_LEN;
|
|
|
|
data_size+= no_bytes_in_map(&m_cols);
|
2009-02-13 17:41:47 +01:00
|
|
|
data_size+= (uint) (end - buf);
|
2007-03-27 12:17:51 +02:00
|
|
|
|
|
|
|
if (type_code == UPDATE_ROWS_EVENT)
|
|
|
|
data_size+= no_bytes_in_map(&m_cols_ai);
|
|
|
|
|
2009-02-13 17:41:47 +01:00
|
|
|
data_size+= (uint) (m_rows_cur - m_rows_buf);
|
2007-03-27 12:17:51 +02:00
|
|
|
return data_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
#ifndef MYSQL_CLIENT
|
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
|
|
|
int Rows_log_event::do_add_row_data(uchar *row_data, size_t length)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
When the table has a primary key, we would probably want, by default, to
|
|
|
|
log only the primary key value instead of the entire "before image". This
|
|
|
|
would save binlog space. TODO
|
|
|
|
*/
|
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
|
|
|
DBUG_ENTER("Rows_log_event::do_add_row_data");
|
2006-11-27 17:16:08 +01:00
|
|
|
DBUG_PRINT("enter", ("row_data: 0x%lx length: %lu", (ulong) row_data,
|
|
|
|
(ulong) length));
|
2006-11-21 13:57:52 +01:00
|
|
|
/*
|
|
|
|
Don't print debug messages when running valgrind since they can
|
|
|
|
trigger false warnings.
|
|
|
|
*/
|
|
|
|
#ifndef HAVE_purify
|
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
|
|
|
DBUG_DUMP("row_data", row_data, min(length, 32));
|
2006-11-21 13:57:52 +01:00
|
|
|
#endif
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
DBUG_ASSERT(m_rows_buf <= m_rows_cur);
|
2006-02-16 08:30:53 +01:00
|
|
|
DBUG_ASSERT(!m_rows_buf || m_rows_end && m_rows_buf < m_rows_end);
|
2005-12-22 06:39:02 +01:00
|
|
|
DBUG_ASSERT(m_rows_cur <= m_rows_end);
|
|
|
|
|
|
|
|
/* The cast will always work since m_rows_cur <= m_rows_end */
|
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 (static_cast<size_t>(m_rows_end - m_rows_cur) <= length)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
size_t const block_size= 1024;
|
2005-12-22 06:39:02 +01:00
|
|
|
my_ptrdiff_t const cur_size= m_rows_cur - m_rows_buf;
|
2006-02-16 08:30:53 +01:00
|
|
|
my_ptrdiff_t const new_alloc=
|
2007-02-24 14:33:45 +01:00
|
|
|
block_size * ((cur_size + length + block_size - 1) / block_size);
|
2005-12-22 06:39:02 +01:00
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar* const new_buf= (uchar*)my_realloc((uchar*)m_rows_buf, (uint) new_alloc,
|
2006-02-16 08:30:53 +01:00
|
|
|
MYF(MY_ALLOW_ZERO_PTR|MY_WME));
|
2005-12-22 06:39:02 +01:00
|
|
|
if (unlikely(!new_buf))
|
|
|
|
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
|
|
|
|
|
|
|
|
/* If the memory moved, we need to move the pointers */
|
|
|
|
if (new_buf != m_rows_buf)
|
|
|
|
{
|
|
|
|
m_rows_buf= new_buf;
|
|
|
|
m_rows_cur= m_rows_buf + cur_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
The end pointer should always be changed to point to the end of
|
|
|
|
the allocated memory.
|
|
|
|
*/
|
|
|
|
m_rows_end= m_rows_buf + new_alloc;
|
|
|
|
}
|
|
|
|
|
2007-02-24 14:33:45 +01:00
|
|
|
DBUG_ASSERT(m_rows_cur + length <= m_rows_end);
|
2005-12-22 06:39:02 +01:00
|
|
|
memcpy(m_rows_cur, row_data, length);
|
|
|
|
m_rows_cur+= length;
|
2006-02-16 08:30:53 +01:00
|
|
|
m_row_count++;
|
2005-12-22 06:39:02 +01:00
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
|
2007-08-16 07:37:50 +02:00
|
|
|
int Rows_log_event::do_apply_event(Relay_log_info const *rli)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
2007-08-16 07:37:50 +02:00
|
|
|
DBUG_ENTER("Rows_log_event::do_apply_event(Relay_log_info*)");
|
2005-12-22 06:39:02 +01:00
|
|
|
int error= 0;
|
2006-02-16 08:30:53 +01:00
|
|
|
/*
|
2006-11-10 15:10:41 +01:00
|
|
|
If m_table_id == ~0UL, then we have a dummy event that does not
|
|
|
|
contain any data. In that case, we just remove all tables in the
|
|
|
|
tables_to_lock list, close the thread tables, and return with
|
2007-03-27 12:17:51 +02:00
|
|
|
success.
|
2006-02-16 08:30:53 +01:00
|
|
|
*/
|
2006-03-09 03:56:14 +01:00
|
|
|
if (m_table_id == ~0UL)
|
2006-02-16 08:30:53 +01:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
This one is supposed to be set: just an extra check so that
|
|
|
|
nothing strange has happened.
|
|
|
|
*/
|
|
|
|
DBUG_ASSERT(get_flags(STMT_END_F));
|
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
const_cast<Relay_log_info*>(rli)->clear_tables_to_lock();
|
2006-02-24 16:19:55 +01:00
|
|
|
close_thread_tables(thd);
|
2006-02-16 08:30:53 +01:00
|
|
|
thd->clear_error();
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
'thd' has been set by exec_relay_log_event(), just before calling
|
2006-11-10 15:10:41 +01:00
|
|
|
do_apply_event(). We still check here to prevent future coding
|
2006-11-01 15:35:37 +01:00
|
|
|
errors.
|
2005-12-22 06:39:02 +01:00
|
|
|
*/
|
|
|
|
DBUG_ASSERT(rli->sql_thd == thd);
|
|
|
|
|
|
|
|
/*
|
2006-02-16 08:30:53 +01:00
|
|
|
If there is no locks taken, this is the first binrow event seen
|
|
|
|
after the table map events. We should then lock all the tables
|
|
|
|
used in the transaction and proceed with execution of the actual
|
|
|
|
event.
|
2005-12-22 06:39:02 +01:00
|
|
|
*/
|
2006-02-16 08:30:53 +01:00
|
|
|
if (!thd->lock)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
|
|
|
/*
|
2008-05-12 19:50:53 +02:00
|
|
|
Lock_tables() reads the contents of thd->lex, so they must be
|
|
|
|
initialized.
|
|
|
|
|
|
|
|
We also call the mysql_reset_thd_for_next_command(), since this
|
|
|
|
is the logical start of the next "statement". Note that this
|
|
|
|
call might reset the value of current_stmt_binlog_row_based, so
|
|
|
|
we need to do any changes to that value after this function.
|
2005-12-22 06:39:02 +01:00
|
|
|
*/
|
2007-04-26 05:38:12 +02:00
|
|
|
lex_start(thd);
|
2008-05-12 19:50:53 +02:00
|
|
|
mysql_reset_thd_for_next_command(thd);
|
|
|
|
|
|
|
|
/*
|
|
|
|
Check if the slave is set to use SBR. If so, it should switch
|
|
|
|
to using RBR until the end of the "statement", i.e., next
|
|
|
|
STMT_END_F or next error.
|
|
|
|
*/
|
|
|
|
if (!thd->current_stmt_binlog_row_based &&
|
|
|
|
mysql_bin_log.is_open() && (thd->options & OPTION_BIN_LOG))
|
|
|
|
{
|
|
|
|
thd->set_current_stmt_binlog_row_based();
|
|
|
|
}
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
|
2007-12-12 11:14:59 +01:00
|
|
|
/*
|
|
|
|
There are a few flags that are replicated with each row event.
|
|
|
|
Make sure to set/clear them before executing the main body of
|
|
|
|
the event.
|
|
|
|
*/
|
|
|
|
if (get_flags(NO_FOREIGN_KEY_CHECKS_F))
|
|
|
|
thd->options|= OPTION_NO_FOREIGN_KEY_CHECKS;
|
|
|
|
else
|
|
|
|
thd->options&= ~OPTION_NO_FOREIGN_KEY_CHECKS;
|
|
|
|
|
|
|
|
if (get_flags(RELAXED_UNIQUE_CHECKS_F))
|
|
|
|
thd->options|= OPTION_RELAXED_UNIQUE_CHECKS;
|
|
|
|
else
|
|
|
|
thd->options&= ~OPTION_RELAXED_UNIQUE_CHECKS;
|
|
|
|
/* A small test to verify that objects have consistent types */
|
|
|
|
DBUG_ASSERT(sizeof(thd->options) == sizeof(OPTION_RELAXED_UNIQUE_CHECKS));
|
|
|
|
|
2008-05-12 19:50:53 +02:00
|
|
|
if (simple_open_n_lock_tables(thd, rli->tables_to_lock))
|
2006-02-16 08:30:53 +01:00
|
|
|
{
|
2008-05-12 19:50:53 +02:00
|
|
|
uint actual_error= thd->main_da.sql_errno();
|
|
|
|
if (thd->is_slave_error || thd->is_fatal_error)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
2008-05-12 19:50:53 +02:00
|
|
|
/*
|
|
|
|
Error reporting borrowed from Query_log_event with many excessive
|
|
|
|
simplifications (we don't honour --slave-skip-errors)
|
|
|
|
*/
|
|
|
|
rli->report(ERROR_LEVEL, actual_error,
|
|
|
|
"Error '%s' on opening tables",
|
|
|
|
(actual_error ? thd->main_da.message() :
|
|
|
|
"unexpected success or fatal error"));
|
|
|
|
thd->is_slave_error= 1;
|
2006-02-16 08:30:53 +01:00
|
|
|
}
|
2008-05-12 19:50:53 +02:00
|
|
|
const_cast<Relay_log_info*>(rli)->clear_tables_to_lock();
|
|
|
|
DBUG_RETURN(actual_error);
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
2007-01-26 19:29:57 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
When the open and locking succeeded, we check all tables to
|
|
|
|
ensure that they still have the correct type.
|
|
|
|
|
|
|
|
We can use a down cast here since we know that every table added
|
|
|
|
to the tables_to_lock is a RPL_TABLE_LIST.
|
|
|
|
*/
|
|
|
|
|
|
|
|
{
|
2007-02-26 17:44:55 +01:00
|
|
|
RPL_TABLE_LIST *ptr= rli->tables_to_lock;
|
2007-01-26 19:29:57 +01:00
|
|
|
for ( ; ptr ; ptr= static_cast<RPL_TABLE_LIST*>(ptr->next_global))
|
|
|
|
{
|
|
|
|
if (ptr->m_tabledef.compatible_with(rli, ptr->table))
|
|
|
|
{
|
|
|
|
mysql_unlock_tables(thd, thd->lock);
|
|
|
|
thd->lock= 0;
|
2007-10-19 23:20:38 +02:00
|
|
|
thd->is_slave_error= 1;
|
2007-08-16 07:37:50 +02:00
|
|
|
const_cast<Relay_log_info*>(rli)->clear_tables_to_lock();
|
2007-01-26 19:29:57 +01:00
|
|
|
DBUG_RETURN(ERR_BAD_TABLE_DEF);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-02-16 08:30:53 +01:00
|
|
|
/*
|
2007-01-26 19:29:57 +01:00
|
|
|
... and then we add all the tables to the table map and remove
|
|
|
|
them from tables to lock.
|
2006-09-06 17:45:27 +02:00
|
|
|
|
|
|
|
We also invalidate the query cache for all the tables, since
|
|
|
|
they will now be changed.
|
2007-01-26 19:29:57 +01:00
|
|
|
|
|
|
|
TODO [/Matz]: Maybe the query cache should not be invalidated
|
|
|
|
here? It might be that a table is not changed, even though it
|
|
|
|
was locked for the statement. We do know that each
|
|
|
|
Rows_log_event contain at least one row, so after processing one
|
|
|
|
Rows_log_event, we can invalidate the query cache for the
|
|
|
|
associated table.
|
2006-02-16 08:30:53 +01:00
|
|
|
*/
|
2007-01-26 19:29:57 +01:00
|
|
|
for (TABLE_LIST *ptr= rli->tables_to_lock ; ptr ; ptr= ptr->next_global)
|
2006-02-16 08:30:53 +01:00
|
|
|
{
|
2007-08-16 07:37:50 +02:00
|
|
|
const_cast<Relay_log_info*>(rli)->m_table_map.set_table(ptr->table_id, ptr->table);
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
2006-09-06 17:45:27 +02:00
|
|
|
#ifdef HAVE_QUERY_CACHE
|
|
|
|
query_cache.invalidate_locked_for_write(rli->tables_to_lock);
|
|
|
|
#endif
|
2006-02-16 08:30:53 +01:00
|
|
|
}
|
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
TABLE*
|
|
|
|
table=
|
2007-08-29 23:28:38 +02:00
|
|
|
m_table= const_cast<Relay_log_info*>(rli)->m_table_map.get_table(m_table_id);
|
2006-02-16 08:30:53 +01:00
|
|
|
|
2008-05-12 19:50:53 +02:00
|
|
|
DBUG_PRINT("debug", ("m_table: 0x%lx, m_table_id: %lu", (ulong) m_table, m_table_id));
|
|
|
|
|
2006-02-16 08:30:53 +01:00
|
|
|
if (table)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
table == NULL means that this table should not be replicated
|
2006-11-10 15:10:41 +01:00
|
|
|
(this was set up by Table_map_log_event::do_apply_event()
|
2006-11-01 15:35:37 +01:00
|
|
|
which tested replicate-* rules).
|
2006-02-16 08:30:53 +01:00
|
|
|
*/
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
It's not needed to set_time() but
|
|
|
|
1) it continues the property that "Time" in SHOW PROCESSLIST shows how
|
|
|
|
much slave is behind
|
|
|
|
2) it will be needed when we allow replication from a table with no
|
|
|
|
TIMESTAMP column to a table with one.
|
|
|
|
So we call set_time(), like in SBR. Presently it changes nothing.
|
|
|
|
*/
|
|
|
|
thd->set_time((time_t)when);
|
|
|
|
|
2007-04-12 08:58:04 +02:00
|
|
|
/*
|
|
|
|
Now we are in a statement and will stay in a statement until we
|
|
|
|
see a STMT_END_F.
|
|
|
|
|
|
|
|
We set this flag here, before actually applying any rows, in
|
|
|
|
case the SQL thread is stopped and we need to detect that we're
|
|
|
|
inside a statement and halting abruptly might cause problems
|
|
|
|
when restarting.
|
|
|
|
*/
|
2007-08-16 07:37:50 +02:00
|
|
|
const_cast<Relay_log_info*>(rli)->set_flag(Relay_log_info::IN_STMT);
|
2007-04-12 08:58:04 +02:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
if ( m_width == table->s->fields && bitmap_is_set_all(&m_cols))
|
|
|
|
set_flags(COMPLETE_ROWS_F);
|
2006-11-20 21:27:39 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
/*
|
|
|
|
Set tables write and read sets.
|
|
|
|
|
|
|
|
Read_set contains all slave columns (in case we are going to fetch
|
|
|
|
a complete record from slave)
|
|
|
|
|
|
|
|
Write_set equals the m_cols bitmap sent from master but it can be
|
|
|
|
longer if slave has extra columns.
|
|
|
|
*/
|
|
|
|
|
|
|
|
DBUG_PRINT_BITSET("debug", "Setting table's write_set from: %s", &m_cols);
|
|
|
|
|
|
|
|
bitmap_set_all(table->read_set);
|
|
|
|
bitmap_set_all(table->write_set);
|
|
|
|
if (!get_flags(COMPLETE_ROWS_F))
|
|
|
|
bitmap_intersect(table->write_set,&m_cols);
|
2005-12-22 06:39:02 +01:00
|
|
|
|
2007-12-12 11:14:59 +01:00
|
|
|
this->slave_exec_mode= slave_exec_mode_options; // fix the mode
|
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
// Do event specific preparations
|
|
|
|
error= do_before_row_operations(rli);
|
2006-11-20 21:27:39 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
// row processing loop
|
2005-12-22 06:39:02 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
while (error == 0 && m_curr_row < m_rows_end)
|
|
|
|
{
|
2005-12-22 06:39:02 +01:00
|
|
|
/* in_use can have been set to NULL in close_tables_for_reopen */
|
|
|
|
THD* old_thd= table->in_use;
|
|
|
|
if (!table->in_use)
|
|
|
|
table->in_use= thd;
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
|
|
|
|
error= do_exec_row(rli);
|
|
|
|
|
2008-10-20 20:50:08 +02:00
|
|
|
DBUG_PRINT("info", ("error: %s", HA_ERR(error)));
|
|
|
|
DBUG_ASSERT(error != HA_ERR_RECORD_DELETED);
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
table->in_use = old_thd;
|
|
|
|
switch (error)
|
|
|
|
{
|
|
|
|
case 0:
|
|
|
|
break;
|
2007-12-12 11:14:59 +01:00
|
|
|
/*
|
|
|
|
The following list of "idempotent" errors
|
|
|
|
means that an error from the list might happen
|
|
|
|
because of idempotent (more than once)
|
|
|
|
applying of a binlog file.
|
|
|
|
Notice, that binlog has a ddl operation its
|
|
|
|
second applying may cause
|
|
|
|
|
|
|
|
case HA_ERR_TABLE_DEF_CHANGED:
|
|
|
|
case HA_ERR_CANNOT_ADD_FOREIGN:
|
2008-10-20 20:50:08 +02:00
|
|
|
|
2007-12-12 11:14:59 +01:00
|
|
|
which are not included into to the list.
|
2008-10-20 20:50:08 +02:00
|
|
|
|
|
|
|
Note that HA_ERR_RECORD_DELETED is not in the list since
|
|
|
|
do_exec_row() should not return that error code.
|
2007-12-12 11:14:59 +01:00
|
|
|
*/
|
2005-12-22 06:39:02 +01:00
|
|
|
case HA_ERR_RECORD_CHANGED:
|
2007-10-30 21:17:19 +01:00
|
|
|
case HA_ERR_KEY_NOT_FOUND:
|
|
|
|
case HA_ERR_END_OF_FILE:
|
2007-12-12 11:14:59 +01:00
|
|
|
case HA_ERR_FOUND_DUPP_KEY:
|
|
|
|
case HA_ERR_FOUND_DUPP_UNIQUE:
|
|
|
|
case HA_ERR_FOREIGN_DUPLICATE_KEY:
|
|
|
|
case HA_ERR_NO_REFERENCED_ROW:
|
|
|
|
case HA_ERR_ROW_IS_REFERENCED:
|
|
|
|
|
|
|
|
if (bit_is_set(slave_exec_mode, SLAVE_EXEC_MODE_IDEMPOTENT) == 1)
|
|
|
|
{
|
|
|
|
if (global_system_variables.log_warnings)
|
|
|
|
slave_rows_error_report(WARNING_LEVEL, error, rli, thd, table,
|
|
|
|
get_type_str(),
|
|
|
|
RPL_LOG_NAME, (ulong) log_pos);
|
|
|
|
error= 0;
|
|
|
|
}
|
2007-10-24 16:02:37 +02:00
|
|
|
break;
|
2007-12-12 11:14:59 +01:00
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
default:
|
2007-10-19 23:20:38 +02:00
|
|
|
thd->is_slave_error= 1;
|
2005-12-22 06:39:02 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
/*
|
|
|
|
If m_curr_row_end was not set during event execution (e.g., because
|
|
|
|
of errors) we can't proceed to the next row. If the error is transient
|
|
|
|
(i.e., error==0 at this point) we must call unpack_current_row() to set
|
|
|
|
m_curr_row_end.
|
|
|
|
*/
|
|
|
|
|
2007-10-20 18:19:55 +02:00
|
|
|
DBUG_PRINT("info", ("curr_row: 0x%lu; curr_row_end: 0x%lu; rows_end: 0x%lu",
|
|
|
|
(ulong) m_curr_row, (ulong) m_curr_row_end, (ulong) m_rows_end));
|
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
if (!m_curr_row_end && !error)
|
|
|
|
unpack_current_row(rli);
|
|
|
|
|
|
|
|
// at this moment m_curr_row_end should be set
|
|
|
|
DBUG_ASSERT(error || m_curr_row_end != NULL);
|
|
|
|
DBUG_ASSERT(error || m_curr_row < m_curr_row_end);
|
|
|
|
DBUG_ASSERT(error || m_curr_row_end <= m_rows_end);
|
|
|
|
|
|
|
|
m_curr_row= m_curr_row_end;
|
|
|
|
|
|
|
|
} // row processing loop
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
DBUG_EXECUTE_IF("STOP_SLAVE_after_first_Rows_event",
|
2007-08-16 07:37:50 +02:00
|
|
|
const_cast<Relay_log_info*>(rli)->abort_slave= 1;);
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
error= do_after_row_operations(rli, error);
|
2005-12-22 06:39:02 +01:00
|
|
|
if (!cache_stmt)
|
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
|
|
|
{
|
|
|
|
DBUG_PRINT("info", ("Marked that we need to keep log"));
|
|
|
|
thd->options|= OPTION_KEEP_LOG;
|
|
|
|
}
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
} // if (table)
|
2005-12-22 06:39:02 +01:00
|
|
|
|
2007-07-30 00:10:42 +02:00
|
|
|
/*
|
2007-08-28 10:14:45 +02:00
|
|
|
We need to delay this clear until here bacause unpack_current_row() uses
|
|
|
|
master-side table definitions stored in rli.
|
2007-07-30 00:10:42 +02:00
|
|
|
*/
|
|
|
|
if (rli->tables_to_lock && get_flags(STMT_END_F))
|
2007-08-16 07:37:50 +02:00
|
|
|
const_cast<Relay_log_info*>(rli)->clear_tables_to_lock();
|
2007-12-12 11:14:59 +01:00
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
if (error)
|
|
|
|
{ /* error has occured during the transaction */
|
2007-12-12 11:14:59 +01:00
|
|
|
slave_rows_error_report(ERROR_LEVEL, error, rli, thd, table,
|
|
|
|
get_type_str(), RPL_LOG_NAME, (ulong) log_pos);
|
|
|
|
}
|
|
|
|
if (error)
|
|
|
|
{
|
2007-06-11 22:15:39 +02:00
|
|
|
/*
|
2005-12-22 06:39:02 +01:00
|
|
|
If one day we honour --skip-slave-errors in row-based replication, and
|
|
|
|
the error should be skipped, then we would clear mappings, rollback,
|
|
|
|
close tables, but the slave SQL thread would not stop and then may
|
|
|
|
assume the mapping is still available, the tables are still open...
|
|
|
|
So then we should clear mappings/rollback/close here only if this is a
|
|
|
|
STMT_END_F.
|
|
|
|
For now we code, knowing that error is not skippable and so slave SQL
|
|
|
|
thread is certainly going to stop.
|
2006-11-03 13:26:40 +01:00
|
|
|
rollback at the caller along with sbr.
|
2005-12-22 06:39:02 +01:00
|
|
|
*/
|
2006-03-08 06:55:21 +01:00
|
|
|
thd->reset_current_stmt_binlog_row_based();
|
2007-08-16 07:37:50 +02:00
|
|
|
const_cast<Relay_log_info*>(rli)->cleanup_context(thd, error);
|
2007-10-19 23:20:38 +02:00
|
|
|
thd->is_slave_error= 1;
|
2005-12-22 06:39:02 +01:00
|
|
|
DBUG_RETURN(error);
|
|
|
|
}
|
|
|
|
|
2007-04-12 08:58:04 +02:00
|
|
|
/*
|
|
|
|
This code would ideally be placed in do_update_pos() instead, but
|
|
|
|
since we have no access to table there, we do the setting of
|
|
|
|
last_event_start_time here instead.
|
|
|
|
*/
|
|
|
|
if (table && (table->s->primary_key == MAX_KEY) &&
|
|
|
|
!cache_stmt && get_flags(STMT_END_F) == RLE_NO_FLAGS)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
------------ Temporary fix until WL#2975 is implemented ---------
|
|
|
|
|
|
|
|
This event is not the last one (no STMT_END_F). If we stop now
|
|
|
|
(in case of terminate_slave_thread()), how will we restart? We
|
|
|
|
have to restart from Table_map_log_event, but as this table is
|
|
|
|
not transactional, the rows already inserted will still be
|
|
|
|
present, and idempotency is not guaranteed (no PK) so we risk
|
|
|
|
that repeating leads to double insert. So we desperately try to
|
|
|
|
continue, hope we'll eventually leave this buggy situation (by
|
|
|
|
executing the final Rows_log_event). If we are in a hopeless
|
|
|
|
wait (reached end of last relay log and nothing gets appended
|
|
|
|
there), we timeout after one minute, and notify DBA about the
|
|
|
|
problem. When WL#2975 is implemented, just remove the member
|
2007-08-29 23:28:38 +02:00
|
|
|
Relay_log_info::last_event_start_time and all its occurrences.
|
2007-04-12 08:58:04 +02:00
|
|
|
*/
|
2007-08-17 11:00:03 +02:00
|
|
|
const_cast<Relay_log_info*>(rli)->last_event_start_time= my_time(0);
|
2007-04-12 08:58:04 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
2007-05-31 20:01:06 +02:00
|
|
|
Log_event::enum_skip_reason
|
2007-08-16 07:37:50 +02:00
|
|
|
Rows_log_event::do_shall_skip(Relay_log_info *rli)
|
2007-05-31 20:01:06 +02:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
If the slave skip counter is 1 and this event does not end a
|
|
|
|
statement, then we should not start executing on the next event.
|
|
|
|
Otherwise, we defer the decision to the normal skipping logic.
|
|
|
|
*/
|
|
|
|
if (rli->slave_skip_counter == 1 && !get_flags(STMT_END_F))
|
|
|
|
return Log_event::EVENT_SKIP_IGNORE;
|
|
|
|
else
|
|
|
|
return Log_event::do_shall_skip(rli);
|
|
|
|
}
|
|
|
|
|
2009-02-04 11:13:54 +01:00
|
|
|
/**
|
|
|
|
The function is called at Rows_log_event statement commit time,
|
|
|
|
normally from Rows_log_event::do_update_pos() and possibly from
|
|
|
|
Query_log_event::do_apply_event() of the COMMIT.
|
|
|
|
The function commits the last statement for engines, binlog and
|
|
|
|
releases resources have been allocated for the statement.
|
|
|
|
|
|
|
|
@retval 0 Ok.
|
|
|
|
@retval non-zero Error at the commit.
|
|
|
|
*/
|
2007-04-12 08:58:04 +02:00
|
|
|
|
2009-02-04 11:13:54 +01:00
|
|
|
static int rows_event_stmt_cleanup(Relay_log_info const *rli, THD * thd)
|
|
|
|
{
|
|
|
|
int error;
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
This is the end of a statement or transaction, so close (and
|
|
|
|
unlock) the tables we opened when processing the
|
|
|
|
Table_map_log_event starting the statement.
|
|
|
|
|
|
|
|
OBSERVER. This will clear *all* mappings, not only those that
|
|
|
|
are open for the table. There is not good handle for on-close
|
|
|
|
actions for tables.
|
|
|
|
|
|
|
|
NOTE. Even if we have no table ('table' == 0) we still need to be
|
|
|
|
here, so that we increase the group relay log position. If we didn't, we
|
|
|
|
could have a group relay log position which lags behind "forever"
|
|
|
|
(assume the last master's transaction is ignored by the slave because of
|
|
|
|
replicate-ignore rules).
|
|
|
|
*/
|
|
|
|
thd->binlog_flush_pending_rows_event(true);
|
2007-04-12 08:58:04 +02:00
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
/*
|
|
|
|
If this event is not in a transaction, the call below will, if some
|
|
|
|
transactional storage engines are involved, commit the statement into
|
|
|
|
them and flush the pending event to binlog.
|
|
|
|
If this event is in a transaction, the call will do nothing, but a
|
|
|
|
Xid_log_event will come next which will, if some transactional engines
|
|
|
|
are involved, commit the transaction and flush the pending event to the
|
|
|
|
binlog.
|
|
|
|
*/
|
|
|
|
error= ha_autocommit_or_rollback(thd, 0);
|
2007-04-12 08:58:04 +02:00
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
/*
|
|
|
|
Now what if this is not a transactional engine? we still need to
|
|
|
|
flush the pending event to the binlog; we did it with
|
|
|
|
thd->binlog_flush_pending_rows_event(). Note that we imitate
|
|
|
|
what is done for real queries: a call to
|
|
|
|
ha_autocommit_or_rollback() (sometimes only if involves a
|
|
|
|
transactional engine), and a call to be sure to have the pending
|
|
|
|
event flushed.
|
|
|
|
*/
|
|
|
|
|
2006-03-08 06:55:21 +01:00
|
|
|
thd->reset_current_stmt_binlog_row_based();
|
2007-12-12 11:14:59 +01:00
|
|
|
|
2009-02-04 11:13:54 +01:00
|
|
|
const_cast<Relay_log_info*>(rli)->cleanup_context(thd, 0);
|
|
|
|
}
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
The method either increments the relay log position or
|
|
|
|
commits the current statement and increments the master group
|
|
|
|
possition if the event is STMT_END_F flagged and
|
|
|
|
the statement corresponds to the autocommit query (i.e replicated
|
|
|
|
without wrapping in BEGIN/COMMIT)
|
|
|
|
|
|
|
|
@retval 0 Success
|
|
|
|
@retval non-zero Error in the statement commit
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
Rows_log_event::do_update_pos(Relay_log_info *rli)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("Rows_log_event::do_update_pos");
|
|
|
|
int error= 0;
|
|
|
|
|
|
|
|
DBUG_PRINT("info", ("flags: %s",
|
|
|
|
get_flags(STMT_END_F) ? "STMT_END_F " : ""));
|
|
|
|
|
|
|
|
if (get_flags(STMT_END_F))
|
|
|
|
{
|
|
|
|
if ((error= rows_event_stmt_cleanup(rli, thd)) == 0)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
2007-04-12 08:58:04 +02:00
|
|
|
/*
|
|
|
|
Indicate that a statement is finished.
|
|
|
|
Step the group log position if we are not in a transaction,
|
|
|
|
otherwise increase the event log position.
|
2009-02-04 11:13:54 +01:00
|
|
|
*/
|
2007-04-12 08:58:04 +02:00
|
|
|
rli->stmt_done(log_pos, when);
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
/*
|
|
|
|
Clear any errors pushed in thd->net.last_err* if for example "no key
|
|
|
|
found" (as this is allowed). This is a safety measure; apparently
|
|
|
|
those errors (e.g. when executing a Delete_rows_log_event of a
|
|
|
|
non-existing row, like in rpl_row_mystery22.test,
|
|
|
|
thd->net.last_error = "Can't find record in 't1'" and last_errno=1032)
|
|
|
|
do not become visible. We still prefer to wipe them out.
|
|
|
|
*/
|
|
|
|
thd->clear_error();
|
|
|
|
}
|
|
|
|
else
|
2009-02-04 11:13:54 +01:00
|
|
|
{
|
2007-06-09 07:19:37 +02:00
|
|
|
rli->report(ERROR_LEVEL, error,
|
|
|
|
"Error in %s event: commit of row events failed, "
|
|
|
|
"table `%s`.`%s`",
|
2007-06-11 22:15:39 +02:00
|
|
|
get_type_str(), m_table->s->db.str,
|
|
|
|
m_table->s->table_name.str);
|
2009-02-04 11:13:54 +01:00
|
|
|
}
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
2007-04-12 08:58:04 +02:00
|
|
|
else
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
2007-04-12 08:58:04 +02:00
|
|
|
rli->inc_event_relay_log_pos();
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
|
2007-04-12 08:58:04 +02:00
|
|
|
DBUG_RETURN(error);
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
2006-11-10 15:10:41 +01:00
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
#endif /* !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) */
|
|
|
|
|
|
|
|
#ifndef MYSQL_CLIENT
|
|
|
|
bool Rows_log_event::write_data_header(IO_CACHE *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 buf[ROWS_HEADER_LEN]; // No need to init the buffer
|
2006-05-31 19:21:52 +02:00
|
|
|
DBUG_ASSERT(m_table_id != ~0UL);
|
2005-12-22 06:39:02 +01:00
|
|
|
DBUG_EXECUTE_IF("old_row_based_repl_4_byte_map_id_master",
|
|
|
|
{
|
|
|
|
int4store(buf + 0, m_table_id);
|
|
|
|
int2store(buf + 4, m_flags);
|
|
|
|
return (my_b_safe_write(file, buf, 6));
|
|
|
|
});
|
|
|
|
int6store(buf + RW_MAPID_OFFSET, (ulonglong)m_table_id);
|
|
|
|
int2store(buf + RW_FLAGS_OFFSET, m_flags);
|
|
|
|
return (my_b_safe_write(file, buf, ROWS_HEADER_LEN));
|
|
|
|
}
|
|
|
|
|
|
|
|
bool Rows_log_event::write_data_body(IO_CACHE*file)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Note that this should be the number of *bits*, not the number of
|
|
|
|
bytes.
|
|
|
|
*/
|
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 sbuf[sizeof(m_width)];
|
2005-12-22 06:39:02 +01:00
|
|
|
my_ptrdiff_t const data_size= m_rows_cur - m_rows_buf;
|
2007-03-27 12:17:51 +02:00
|
|
|
bool res= false;
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar *const sbuf_end= net_store_length(sbuf, (size_t) m_width);
|
|
|
|
DBUG_ASSERT(static_cast<size_t>(sbuf_end - sbuf) <= sizeof(sbuf));
|
2005-12-22 06:39:02 +01:00
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
DBUG_DUMP("m_width", sbuf, (size_t) (sbuf_end - sbuf));
|
|
|
|
res= res || my_b_safe_write(file, sbuf, (size_t) (sbuf_end - sbuf));
|
2005-12-22 06:39:02 +01:00
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
DBUG_DUMP("m_cols", (uchar*) m_cols.bitmap, no_bytes_in_map(&m_cols));
|
|
|
|
res= res || my_b_safe_write(file, (uchar*) m_cols.bitmap,
|
2007-03-27 12:17:51 +02:00
|
|
|
no_bytes_in_map(&m_cols));
|
|
|
|
/*
|
|
|
|
TODO[refactor write]: Remove the "down cast" here (and elsewhere).
|
|
|
|
*/
|
|
|
|
if (get_type_code() == UPDATE_ROWS_EVENT)
|
|
|
|
{
|
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
|
|
|
DBUG_DUMP("m_cols_ai", (uchar*) m_cols_ai.bitmap,
|
|
|
|
no_bytes_in_map(&m_cols_ai));
|
|
|
|
res= res || my_b_safe_write(file, (uchar*) m_cols_ai.bitmap,
|
2007-03-27 12:17:51 +02:00
|
|
|
no_bytes_in_map(&m_cols_ai));
|
|
|
|
}
|
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
|
|
|
DBUG_DUMP("rows", m_rows_buf, data_size);
|
|
|
|
res= res || my_b_safe_write(file, m_rows_buf, (size_t) data_size);
|
2007-03-27 12:17:51 +02:00
|
|
|
|
|
|
|
return res;
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2006-02-16 08:30:53 +01:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2005-12-22 06:39:02 +01:00
|
|
|
void Rows_log_event::pack_info(Protocol *protocol)
|
|
|
|
{
|
2006-02-16 08:30:53 +01:00
|
|
|
char buf[256];
|
|
|
|
char const *const flagstr=
|
|
|
|
get_flags(STMT_END_F) ? " flags: STMT_END_F" : "";
|
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
|
|
|
size_t bytes= my_snprintf(buf, sizeof(buf),
|
2006-03-13 16:07:00 +01:00
|
|
|
"table_id: %lu%s", m_table_id, flagstr);
|
2006-02-16 08:30:53 +01:00
|
|
|
protocol->store(buf, bytes, &my_charset_bin);
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2006-10-06 10:17:02 +02:00
|
|
|
#ifdef MYSQL_CLIENT
|
|
|
|
void Rows_log_event::print_helper(FILE *file,
|
|
|
|
PRINT_EVENT_INFO *print_event_info,
|
|
|
|
char const *const name)
|
|
|
|
{
|
|
|
|
IO_CACHE *const head= &print_event_info->head_cache;
|
|
|
|
IO_CACHE *const body= &print_event_info->body_cache;
|
|
|
|
if (!print_event_info->short_form)
|
|
|
|
{
|
|
|
|
bool const last_stmt_event= get_flags(STMT_END_F);
|
|
|
|
print_header(head, print_event_info, !last_stmt_event);
|
2007-04-12 08:58:04 +02:00
|
|
|
my_b_printf(head, "\t%s: table id %lu%s\n",
|
|
|
|
name, m_table_id,
|
|
|
|
last_stmt_event ? " flags: STMT_END_F" : "");
|
2006-10-06 10:17:02 +02:00
|
|
|
print_base64(body, print_event_info, !last_stmt_event);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (get_flags(STMT_END_F))
|
|
|
|
{
|
2007-03-22 17:31:39 +01:00
|
|
|
copy_event_cache_to_file_and_reinit(head, file);
|
|
|
|
copy_event_cache_to_file_and_reinit(body, file);
|
2006-10-06 10:17:02 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
/**************************************************************************
|
2006-05-03 15:00:38 +02:00
|
|
|
Table_map_log_event member functions and support functions
|
2005-12-22 06:39:02 +01:00
|
|
|
**************************************************************************/
|
|
|
|
|
2007-07-30 00:10:42 +02:00
|
|
|
/**
|
|
|
|
@page How replication of field metadata works.
|
|
|
|
|
|
|
|
When a table map is created, the master first calls
|
2007-08-10 18:48:01 +02:00
|
|
|
Table_map_log_event::save_field_metadata() which calculates how many
|
2007-07-30 00:10:42 +02:00
|
|
|
values will be in the field metadata. Only those fields that require the
|
2007-08-10 18:48:01 +02:00
|
|
|
extra data are added. The method also loops through all of the fields in
|
|
|
|
the table calling the method Field::save_field_metadata() which returns the
|
|
|
|
values for the field that will be saved in the metadata and replicated to
|
|
|
|
the slave. Once all fields have been processed, the table map is written to
|
|
|
|
the binlog adding the size of the field metadata and the field metadata to
|
|
|
|
the end of the body of the table map.
|
|
|
|
|
2007-07-30 00:10:42 +02:00
|
|
|
When a table map is read on the slave, the field metadata is read from the
|
|
|
|
table map and passed to the table_def class constructor which saves the
|
|
|
|
field metadata from the table map into an array based on the type of the
|
|
|
|
field. Field metadata values not present (those fields that do not use extra
|
|
|
|
data) in the table map are initialized as zero (0). The array size is the
|
|
|
|
same as the columns for the table on the slave.
|
|
|
|
|
2007-09-14 17:22:41 +02:00
|
|
|
Additionally, values saved for field metadata on the master are saved as a
|
|
|
|
string of bytes (uchar) in the binlog. A field may require 1 or more bytes
|
|
|
|
to store the information. In cases where values require multiple bytes
|
|
|
|
(e.g. values > 255), the endian-safe methods are used to properly encode
|
|
|
|
the values on the master and decode them on the slave. When the field
|
|
|
|
metadata values are captured on the slave, they are stored in an array of
|
|
|
|
type uint16. This allows the least number of casts to prevent casting bugs
|
|
|
|
when the field metadata is used in comparisons of field attributes. When
|
|
|
|
the field metadata is used for calculating addresses in pointer math, the
|
|
|
|
type used is uint32.
|
2007-07-30 00:10:42 +02:00
|
|
|
*/
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
#if !defined(MYSQL_CLIENT)
|
2007-07-30 00:10:42 +02:00
|
|
|
/**
|
|
|
|
Save the field metadata based on the real_type of the field.
|
|
|
|
The metadata saved depends on the type of the field. Some fields
|
|
|
|
store a single byte for pack_length() while others store two bytes
|
|
|
|
for field_length (max length).
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@retval 0 Ok.
|
2007-07-30 00:10:42 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@todo
|
|
|
|
We may want to consider changing the encoding of the information.
|
2007-07-30 00:10:42 +02:00
|
|
|
Currently, the code attempts to minimize the number of bytes written to
|
|
|
|
the tablemap. There are at least two other alternatives; 1) using
|
|
|
|
net_store_length() to store the data allowing it to choose the number of
|
|
|
|
bytes that are appropriate thereby making the code much easier to
|
|
|
|
maintain (only 1 place to change the encoding), or 2) use a fixed number
|
|
|
|
of bytes for each field. The problem with option 1 is that net_store_length()
|
|
|
|
will use one byte if the value < 251, but 3 bytes if it is > 250. Thus,
|
|
|
|
for fields like CHAR which can be no larger than 255 characters, the method
|
|
|
|
will use 3 bytes when the value is > 250. Further, every value that is
|
|
|
|
encoded using 2 parts (e.g., pack_length, field_length) will be numerically
|
|
|
|
> 250 therefore will use 3 bytes for eah value. The problem with option 2
|
|
|
|
is less wasteful for space but does waste 1 byte for every field that does
|
|
|
|
not encode 2 parts.
|
|
|
|
*/
|
|
|
|
int Table_map_log_event::save_field_metadata()
|
|
|
|
{
|
|
|
|
DBUG_ENTER("Table_map_log_event::save_field_metadata");
|
|
|
|
int index= 0;
|
|
|
|
for (unsigned int i= 0 ; i < m_table->s->fields ; i++)
|
2007-08-10 18:48:01 +02:00
|
|
|
index+= m_table->s->field[i]->save_field_metadata(&m_field_metadata[index]);
|
|
|
|
DBUG_RETURN(index);
|
2007-07-30 00:10:42 +02:00
|
|
|
}
|
|
|
|
#endif /* !defined(MYSQL_CLIENT) */
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
/*
|
|
|
|
Constructor used to build an event for writing to the binary log.
|
|
|
|
Mats says tbl->s lives longer than this event so it's ok to copy pointers
|
|
|
|
(tbl->s->db etc) and not pointer content.
|
|
|
|
*/
|
|
|
|
#if !defined(MYSQL_CLIENT)
|
|
|
|
Table_map_log_event::Table_map_log_event(THD *thd, TABLE *tbl, ulong tid,
|
|
|
|
bool is_transactional, uint16 flags)
|
2008-03-28 13:16:41 +01:00
|
|
|
: Log_event(thd, 0, true),
|
2005-12-22 06:39:02 +01:00
|
|
|
m_table(tbl),
|
|
|
|
m_dbnam(tbl->s->db.str),
|
|
|
|
m_dblen(m_dbnam ? tbl->s->db.length : 0),
|
|
|
|
m_tblnam(tbl->s->table_name.str),
|
|
|
|
m_tbllen(tbl->s->table_name.length),
|
2007-10-19 23:20:38 +02:00
|
|
|
m_colcnt(tbl->s->fields),
|
|
|
|
m_memory(NULL),
|
|
|
|
m_table_id(tid),
|
|
|
|
m_flags(flags),
|
|
|
|
m_data_size(0),
|
|
|
|
m_field_metadata(0),
|
|
|
|
m_field_metadata_size(0),
|
|
|
|
m_null_bits(0),
|
|
|
|
m_meta_memory(NULL)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
2006-03-09 03:56:14 +01:00
|
|
|
DBUG_ASSERT(m_table_id != ~0UL);
|
2005-12-22 06:39:02 +01:00
|
|
|
/*
|
|
|
|
In TABLE_SHARE, "db" and "table_name" are 0-terminated (see this comment in
|
|
|
|
table.cc / alloc_table_share():
|
|
|
|
Use the fact the key is db/0/table_name/0
|
|
|
|
As we rely on this let's assert it.
|
|
|
|
*/
|
|
|
|
DBUG_ASSERT((tbl->s->db.str == 0) ||
|
|
|
|
(tbl->s->db.str[tbl->s->db.length] == 0));
|
|
|
|
DBUG_ASSERT(tbl->s->table_name.str[tbl->s->table_name.length] == 0);
|
|
|
|
|
|
|
|
|
|
|
|
m_data_size= TABLE_MAP_HEADER_LEN;
|
2006-02-14 22:36:11 +01:00
|
|
|
DBUG_EXECUTE_IF("old_row_based_repl_4_byte_map_id_master", m_data_size= 6;);
|
2005-12-22 06:39:02 +01:00
|
|
|
m_data_size+= m_dblen + 2; // Include length and terminating \0
|
|
|
|
m_data_size+= m_tbllen + 2; // Include length and terminating \0
|
|
|
|
m_data_size+= 1 + m_colcnt; // COLCNT and column types
|
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
/* If malloc fails, caught in is_valid() */
|
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 ((m_memory= (uchar*) my_malloc(m_colcnt, MYF(MY_WME))))
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
2006-06-19 11:45:34 +02:00
|
|
|
m_coltype= reinterpret_cast<uchar*>(m_memory);
|
2005-12-22 06:39:02 +01:00
|
|
|
for (unsigned int i= 0 ; i < m_table->s->fields ; ++i)
|
|
|
|
m_coltype[i]= m_table->field[i]->type();
|
|
|
|
}
|
2007-07-30 00:10:42 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
Calculate a bitmap for the results of maybe_null() for all columns.
|
|
|
|
The bitmap is used to determine when there is a column from the master
|
|
|
|
that is not on the slave and is null and thus not in the row data during
|
|
|
|
replication.
|
|
|
|
*/
|
|
|
|
uint num_null_bytes= (m_table->s->fields + 7) / 8;
|
|
|
|
m_data_size+= num_null_bytes;
|
|
|
|
m_meta_memory= (uchar *)my_multi_malloc(MYF(MY_WME),
|
|
|
|
&m_null_bits, num_null_bytes,
|
2007-08-10 18:48:01 +02:00
|
|
|
&m_field_metadata, (m_colcnt * 2),
|
2007-07-30 00:10:42 +02:00
|
|
|
NULL);
|
2007-08-10 18:48:01 +02:00
|
|
|
|
|
|
|
bzero(m_field_metadata, (m_colcnt * 2));
|
|
|
|
|
|
|
|
/*
|
|
|
|
Create an array for the field metadata and store it.
|
|
|
|
*/
|
|
|
|
m_field_metadata_size= save_field_metadata();
|
|
|
|
DBUG_ASSERT(m_field_metadata_size <= (m_colcnt * 2));
|
|
|
|
|
|
|
|
/*
|
|
|
|
Now set the size of the data to the size of the field metadata array
|
|
|
|
plus one or two bytes for number of elements in the field metadata array.
|
|
|
|
*/
|
|
|
|
if (m_field_metadata_size > 255)
|
|
|
|
m_data_size+= m_field_metadata_size + 2;
|
|
|
|
else
|
|
|
|
m_data_size+= m_field_metadata_size + 1;
|
|
|
|
|
2007-07-30 00:10:42 +02:00
|
|
|
bzero(m_null_bits, num_null_bytes);
|
|
|
|
for (unsigned int i= 0 ; i < m_table->s->fields ; ++i)
|
|
|
|
if (m_table->field[i]->maybe_null())
|
|
|
|
m_null_bits[(i / 8)]+= 1 << (i % 8);
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
#endif /* !defined(MYSQL_CLIENT) */
|
|
|
|
|
|
|
|
/*
|
|
|
|
Constructor used by slave to read the event from the binary log.
|
|
|
|
*/
|
|
|
|
#if defined(HAVE_REPLICATION)
|
|
|
|
Table_map_log_event::Table_map_log_event(const char *buf, uint event_len,
|
|
|
|
const Format_description_log_event
|
|
|
|
*description_event)
|
|
|
|
|
|
|
|
: Log_event(buf, description_event),
|
|
|
|
#ifndef MYSQL_CLIENT
|
2007-09-24 10:50:57 +02:00
|
|
|
m_table(NULL),
|
2005-12-22 06:39:02 +01:00
|
|
|
#endif
|
2007-09-24 10:50:57 +02:00
|
|
|
m_dbnam(NULL), m_dblen(0), m_tblnam(NULL), m_tbllen(0),
|
|
|
|
m_colcnt(0), m_coltype(0),
|
|
|
|
m_memory(NULL), m_table_id(ULONG_MAX), m_flags(0),
|
|
|
|
m_data_size(0), m_field_metadata(0), m_field_metadata_size(0),
|
|
|
|
m_null_bits(0), m_meta_memory(NULL)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
2007-07-30 00:10:42 +02:00
|
|
|
unsigned int bytes_read= 0;
|
2005-12-22 06:39:02 +01:00
|
|
|
DBUG_ENTER("Table_map_log_event::Table_map_log_event(const char*,uint,...)");
|
|
|
|
|
|
|
|
uint8 common_header_len= description_event->common_header_len;
|
|
|
|
uint8 post_header_len= description_event->post_header_len[TABLE_MAP_EVENT-1];
|
2006-11-27 00:47:38 +01:00
|
|
|
DBUG_PRINT("info",("event_len: %u common_header_len: %d post_header_len: %d",
|
2005-12-22 06:39:02 +01:00
|
|
|
event_len, common_header_len, post_header_len));
|
|
|
|
|
2006-11-21 13:57:52 +01:00
|
|
|
/*
|
|
|
|
Don't print debug messages when running valgrind since they can
|
|
|
|
trigger false warnings.
|
|
|
|
*/
|
|
|
|
#ifndef HAVE_purify
|
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
|
|
|
DBUG_DUMP("event buffer", (uchar*) buf, event_len);
|
2006-11-21 13:57:52 +01:00
|
|
|
#endif
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
/* Read the post-header */
|
|
|
|
const char *post_start= buf + common_header_len;
|
|
|
|
|
|
|
|
post_start+= TM_MAPID_OFFSET;
|
|
|
|
if (post_header_len == 6)
|
|
|
|
{
|
|
|
|
/* Master is of an intermediate source tree before 5.1.4. Id is 4 bytes */
|
|
|
|
m_table_id= uint4korr(post_start);
|
|
|
|
post_start+= 4;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
DBUG_ASSERT(post_header_len == TABLE_MAP_HEADER_LEN);
|
2006-11-30 02:40:42 +01:00
|
|
|
m_table_id= (ulong) uint6korr(post_start);
|
2005-12-22 06:39:02 +01:00
|
|
|
post_start+= TM_FLAGS_OFFSET;
|
|
|
|
}
|
|
|
|
|
2006-03-09 03:56:14 +01:00
|
|
|
DBUG_ASSERT(m_table_id != ~0UL);
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
m_flags= uint2korr(post_start);
|
|
|
|
|
|
|
|
/* Read the variable part of the event */
|
|
|
|
const char *const vpart= buf + common_header_len + post_header_len;
|
|
|
|
|
|
|
|
/* Extract the length of the various parts from the buffer */
|
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 const *const ptr_dblen= (uchar const*)vpart + 0;
|
2006-06-19 11:45:34 +02:00
|
|
|
m_dblen= *(uchar*) ptr_dblen;
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
/* Length of database name + counter + terminating null */
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar const *const ptr_tbllen= ptr_dblen + m_dblen + 2;
|
2006-06-19 11:45:34 +02:00
|
|
|
m_tbllen= *(uchar*) ptr_tbllen;
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
/* Length of table name + counter + terminating null */
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar const *const ptr_colcnt= ptr_tbllen + m_tbllen + 2;
|
2006-02-23 22:19:47 +01:00
|
|
|
uchar *ptr_after_colcnt= (uchar*) ptr_colcnt;
|
|
|
|
m_colcnt= net_field_length(&ptr_after_colcnt);
|
2005-12-22 06:39:02 +01:00
|
|
|
|
2006-11-27 17:16:08 +01:00
|
|
|
DBUG_PRINT("info",("m_dblen: %lu off: %ld m_tbllen: %lu off: %ld m_colcnt: %lu off: %ld",
|
2007-06-11 22:15:39 +02:00
|
|
|
(ulong) m_dblen, (long) (ptr_dblen-(const uchar*)vpart),
|
|
|
|
(ulong) m_tbllen, (long) (ptr_tbllen-(const uchar*)vpart),
|
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
|
|
|
m_colcnt, (long) (ptr_colcnt-(const uchar*)vpart)));
|
2005-12-22 06:39:02 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
/* Allocate mem for all fields in one go. If fails, caught in is_valid() */
|
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
|
|
|
m_memory= (uchar*) my_multi_malloc(MYF(MY_WME),
|
|
|
|
&m_dbnam, (uint) m_dblen + 1,
|
|
|
|
&m_tblnam, (uint) m_tbllen + 1,
|
|
|
|
&m_coltype, (uint) m_colcnt,
|
|
|
|
NullS);
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
if (m_memory)
|
|
|
|
{
|
|
|
|
/* Copy the different parts into their memory */
|
2005-12-30 13:32:33 +01:00
|
|
|
strncpy(const_cast<char*>(m_dbnam), (const char*)ptr_dblen + 1, m_dblen + 1);
|
|
|
|
strncpy(const_cast<char*>(m_tblnam), (const char*)ptr_tbllen + 1, m_tbllen + 1);
|
2005-12-22 06:39:02 +01:00
|
|
|
memcpy(m_coltype, ptr_after_colcnt, m_colcnt);
|
2007-07-30 00:10:42 +02:00
|
|
|
|
|
|
|
ptr_after_colcnt= ptr_after_colcnt + m_colcnt;
|
2009-02-13 17:41:47 +01:00
|
|
|
bytes_read= (uint) (ptr_after_colcnt - (uchar *)buf);
|
2007-07-30 00:10:42 +02:00
|
|
|
DBUG_PRINT("info", ("Bytes read: %d.\n", bytes_read));
|
|
|
|
if (bytes_read < event_len)
|
|
|
|
{
|
|
|
|
m_field_metadata_size= net_field_length(&ptr_after_colcnt);
|
2007-07-30 23:39:54 +02:00
|
|
|
DBUG_ASSERT(m_field_metadata_size <= (m_colcnt * 2));
|
2007-07-30 00:10:42 +02:00
|
|
|
uint num_null_bytes= (m_colcnt + 7) / 8;
|
|
|
|
m_meta_memory= (uchar *)my_multi_malloc(MYF(MY_WME),
|
|
|
|
&m_null_bits, num_null_bytes,
|
|
|
|
&m_field_metadata, m_field_metadata_size,
|
|
|
|
NULL);
|
|
|
|
memcpy(m_field_metadata, ptr_after_colcnt, m_field_metadata_size);
|
|
|
|
ptr_after_colcnt= (uchar*)ptr_after_colcnt + m_field_metadata_size;
|
|
|
|
memcpy(m_null_bits, ptr_after_colcnt, num_null_bytes);
|
|
|
|
}
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
Table_map_log_event::~Table_map_log_event()
|
|
|
|
{
|
2007-07-30 00:10:42 +02:00
|
|
|
my_free(m_meta_memory, MYF(MY_ALLOW_ZERO_PTR));
|
2005-12-22 06:39:02 +01:00
|
|
|
my_free(m_memory, MYF(MY_ALLOW_ZERO_PTR));
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
Return value is an error code, one of:
|
|
|
|
|
|
|
|
-1 Failure to open table [from open_tables()]
|
|
|
|
0 Success
|
|
|
|
1 No room for more tables [from set_table()]
|
|
|
|
2 Out of memory [from set_table()]
|
|
|
|
3 Wrong table definition
|
|
|
|
4 Daisy-chaining RBR with SBR not possible
|
|
|
|
*/
|
|
|
|
|
|
|
|
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
|
2007-08-16 07:37:50 +02:00
|
|
|
int Table_map_log_event::do_apply_event(Relay_log_info const *rli)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
RPL_TABLE_LIST *table_list;
|
|
|
|
char *db_mem, *tname_mem;
|
|
|
|
size_t dummy_len;
|
|
|
|
void *memory;
|
2007-08-16 07:37:50 +02:00
|
|
|
DBUG_ENTER("Table_map_log_event::do_apply_event(Relay_log_info*)");
|
2005-12-22 06:39:02 +01:00
|
|
|
DBUG_ASSERT(rli->sql_thd == thd);
|
|
|
|
|
|
|
|
/* Step the query id to mark what columns that are actually used. */
|
|
|
|
pthread_mutex_lock(&LOCK_thread_count);
|
|
|
|
thd->query_id= next_query_id();
|
|
|
|
pthread_mutex_unlock(&LOCK_thread_count);
|
|
|
|
|
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 (!(memory= my_multi_malloc(MYF(MY_WME),
|
|
|
|
&table_list, (uint) sizeof(RPL_TABLE_LIST),
|
|
|
|
&db_mem, (uint) NAME_LEN + 1,
|
|
|
|
&tname_mem, (uint) NAME_LEN + 1,
|
|
|
|
NullS)))
|
2006-05-09 12:30:06 +02:00
|
|
|
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
|
2006-02-16 08:30:53 +01:00
|
|
|
|
|
|
|
bzero(table_list, sizeof(*table_list));
|
|
|
|
table_list->db = db_mem;
|
|
|
|
table_list->alias= table_list->table_name = tname_mem;
|
|
|
|
table_list->lock_type= TL_WRITE;
|
|
|
|
table_list->next_global= table_list->next_local= 0;
|
|
|
|
table_list->table_id= m_table_id;
|
|
|
|
table_list->updating= 1;
|
|
|
|
strmov(table_list->db, rpl_filter->get_rewrite_db(m_dbnam, &dummy_len));
|
|
|
|
strmov(table_list->table_name, m_tblnam);
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
int error= 0;
|
|
|
|
|
2008-09-03 12:01:18 +02:00
|
|
|
if (rli->sql_thd->slave_thread /* filtering is for slave only */ &&
|
|
|
|
(!rpl_filter->db_ok(table_list->db) ||
|
|
|
|
(rpl_filter->is_on() && !rpl_filter->tables_ok("", table_list))))
|
2006-05-09 12:30:06 +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
|
|
|
my_free(memory, MYF(MY_WME));
|
2006-05-09 12:30:06 +02:00
|
|
|
}
|
|
|
|
else
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
2007-01-26 19:29:57 +01:00
|
|
|
DBUG_ASSERT(thd->lex->query_tables != table_list);
|
2005-12-22 06:39:02 +01:00
|
|
|
|
2007-01-26 19:29:57 +01:00
|
|
|
/*
|
|
|
|
Use placement new to construct the table_def instance in the
|
|
|
|
memory allocated for it inside table_list.
|
2007-02-26 17:44:55 +01:00
|
|
|
|
|
|
|
The memory allocated by the table_def structure (i.e., not the
|
|
|
|
memory allocated *for* the table_def structure) is released
|
2007-08-16 07:37:50 +02:00
|
|
|
inside Relay_log_info::clear_tables_to_lock() by calling the
|
2007-02-26 17:44:55 +01:00
|
|
|
table_def destructor explicitly.
|
2007-01-26 19:29:57 +01:00
|
|
|
*/
|
2007-07-30 00:10:42 +02:00
|
|
|
new (&table_list->m_tabledef) table_def(m_coltype, m_colcnt,
|
|
|
|
m_field_metadata, m_field_metadata_size, m_null_bits);
|
2007-02-26 17:44:55 +01:00
|
|
|
table_list->m_tabledef_valid= TRUE;
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
/*
|
2006-02-16 08:30:53 +01:00
|
|
|
We record in the slave's information that the table should be
|
2006-11-03 21:55:51 +01:00
|
|
|
locked by linking the table into the list of tables to lock.
|
2005-12-22 06:39:02 +01:00
|
|
|
*/
|
2006-06-23 09:35:45 +02:00
|
|
|
table_list->next_global= table_list->next_local= rli->tables_to_lock;
|
2007-08-16 07:37:50 +02:00
|
|
|
const_cast<Relay_log_info*>(rli)->tables_to_lock= table_list;
|
|
|
|
const_cast<Relay_log_info*>(rli)->tables_to_lock_count++;
|
2006-06-23 09:35:45 +02:00
|
|
|
/* 'memory' is freed in clear_tables_to_lock */
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
|
2006-06-23 09:35:45 +02:00
|
|
|
DBUG_RETURN(error);
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
2006-11-10 15:10:41 +01:00
|
|
|
|
2007-05-31 20:01:06 +02:00
|
|
|
Log_event::enum_skip_reason
|
2007-08-16 07:37:50 +02:00
|
|
|
Table_map_log_event::do_shall_skip(Relay_log_info *rli)
|
2007-05-31 20:01:06 +02:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
If the slave skip counter is 1, then we should not start executing
|
|
|
|
on the next event.
|
|
|
|
*/
|
2007-10-19 14:18:41 +02:00
|
|
|
return continue_group(rli);
|
2007-05-31 20:01:06 +02:00
|
|
|
}
|
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
int Table_map_log_event::do_update_pos(Relay_log_info *rli)
|
2006-11-10 15:10:41 +01:00
|
|
|
{
|
|
|
|
rli->inc_event_relay_log_pos();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
#endif /* !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) */
|
|
|
|
|
|
|
|
#ifndef MYSQL_CLIENT
|
|
|
|
bool Table_map_log_event::write_data_header(IO_CACHE *file)
|
|
|
|
{
|
2006-03-09 03:56:14 +01:00
|
|
|
DBUG_ASSERT(m_table_id != ~0UL);
|
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 buf[TABLE_MAP_HEADER_LEN];
|
2005-12-22 06:39:02 +01:00
|
|
|
DBUG_EXECUTE_IF("old_row_based_repl_4_byte_map_id_master",
|
|
|
|
{
|
|
|
|
int4store(buf + 0, m_table_id);
|
|
|
|
int2store(buf + 4, m_flags);
|
|
|
|
return (my_b_safe_write(file, buf, 6));
|
|
|
|
});
|
|
|
|
int6store(buf + TM_MAPID_OFFSET, (ulonglong)m_table_id);
|
|
|
|
int2store(buf + TM_FLAGS_OFFSET, m_flags);
|
|
|
|
return (my_b_safe_write(file, buf, TABLE_MAP_HEADER_LEN));
|
|
|
|
}
|
|
|
|
|
|
|
|
bool Table_map_log_event::write_data_body(IO_CACHE *file)
|
|
|
|
{
|
|
|
|
DBUG_ASSERT(m_dbnam != NULL);
|
|
|
|
DBUG_ASSERT(m_tblnam != NULL);
|
|
|
|
/* We use only one byte per length for storage in event: */
|
|
|
|
DBUG_ASSERT(m_dblen < 128);
|
|
|
|
DBUG_ASSERT(m_tbllen < 128);
|
|
|
|
|
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 const dbuf[]= { (uchar) m_dblen };
|
|
|
|
uchar const tbuf[]= { (uchar) m_tbllen };
|
2005-12-22 06:39:02 +01:00
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar cbuf[sizeof(m_colcnt)];
|
|
|
|
uchar *const cbuf_end= net_store_length(cbuf, (size_t) m_colcnt);
|
|
|
|
DBUG_ASSERT(static_cast<size_t>(cbuf_end - cbuf) <= sizeof(cbuf));
|
2005-12-22 06:39:02 +01:00
|
|
|
|
2007-07-30 00:10:42 +02:00
|
|
|
/*
|
|
|
|
Store the size of the field metadata.
|
|
|
|
*/
|
|
|
|
uchar mbuf[sizeof(m_field_metadata_size)];
|
2007-07-30 23:39:54 +02:00
|
|
|
uchar *const mbuf_end= net_store_length(mbuf, m_field_metadata_size);
|
2005-12-22 06:39:02 +01:00
|
|
|
|
2006-01-04 05:37:24 +01:00
|
|
|
return (my_b_safe_write(file, dbuf, sizeof(dbuf)) ||
|
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_b_safe_write(file, (const uchar*)m_dbnam, m_dblen+1) ||
|
2005-12-22 06:39:02 +01:00
|
|
|
my_b_safe_write(file, tbuf, sizeof(tbuf)) ||
|
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_b_safe_write(file, (const uchar*)m_tblnam, m_tbllen+1) ||
|
|
|
|
my_b_safe_write(file, cbuf, (size_t) (cbuf_end - cbuf)) ||
|
2007-07-30 00:10:42 +02:00
|
|
|
my_b_safe_write(file, m_coltype, m_colcnt) ||
|
|
|
|
my_b_safe_write(file, mbuf, (size_t) (mbuf_end - mbuf)) ||
|
|
|
|
my_b_safe_write(file, m_field_metadata, m_field_metadata_size),
|
|
|
|
my_b_safe_write(file, m_null_bits, (m_colcnt + 7) / 8));
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
|
|
|
|
|
|
|
/*
|
|
|
|
Print some useful information for the SHOW BINARY LOG information
|
|
|
|
field.
|
|
|
|
*/
|
|
|
|
|
2006-02-16 08:30:53 +01:00
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
2005-12-22 06:39:02 +01:00
|
|
|
void Table_map_log_event::pack_info(Protocol *protocol)
|
|
|
|
{
|
|
|
|
char buf[256];
|
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
|
|
|
size_t bytes= my_snprintf(buf, sizeof(buf),
|
2006-03-13 16:07:00 +01:00
|
|
|
"table_id: %lu (%s.%s)",
|
2006-02-16 08:30:53 +01:00
|
|
|
m_table_id, m_dbnam, m_tblnam);
|
2005-12-22 06:39:02 +01:00
|
|
|
protocol->store(buf, bytes, &my_charset_bin);
|
|
|
|
}
|
2006-02-16 08:30:53 +01:00
|
|
|
#endif
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef MYSQL_CLIENT
|
|
|
|
void Table_map_log_event::print(FILE *file, PRINT_EVENT_INFO *print_event_info)
|
|
|
|
{
|
|
|
|
if (!print_event_info->short_form)
|
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
print_header(&print_event_info->head_cache, print_event_info, TRUE);
|
|
|
|
my_b_printf(&print_event_info->head_cache,
|
|
|
|
"\tTable_map: `%s`.`%s` mapped to number %lu\n",
|
|
|
|
m_dbnam, m_tblnam, m_table_id);
|
|
|
|
print_base64(&print_event_info->body_cache, print_event_info, TRUE);
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/**************************************************************************
|
|
|
|
Write_rows_log_event member functions
|
|
|
|
**************************************************************************/
|
|
|
|
|
|
|
|
/*
|
|
|
|
Constructor used to build an event for writing to the binary log.
|
|
|
|
*/
|
|
|
|
#if !defined(MYSQL_CLIENT)
|
|
|
|
Write_rows_log_event::Write_rows_log_event(THD *thd_arg, TABLE *tbl_arg,
|
|
|
|
ulong tid_arg,
|
|
|
|
MY_BITMAP const *cols,
|
|
|
|
bool is_transactional)
|
|
|
|
: Rows_log_event(thd_arg, tbl_arg, tid_arg, cols, is_transactional)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
Constructor used by slave to read the event from the binary log.
|
|
|
|
*/
|
|
|
|
#ifdef HAVE_REPLICATION
|
|
|
|
Write_rows_log_event::Write_rows_log_event(const char *buf, uint event_len,
|
|
|
|
const Format_description_log_event
|
|
|
|
*description_event)
|
|
|
|
: Rows_log_event(buf, event_len, WRITE_ROWS_EVENT, description_event)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
int
|
|
|
|
Write_rows_log_event::do_before_row_operations(const Slave_reporting_capability *const)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
|
|
|
int error= 0;
|
|
|
|
|
2007-12-12 11:14:59 +01:00
|
|
|
/**
|
|
|
|
todo: to introduce a property for the event (handler?) which forces
|
|
|
|
applying the event in the replace (idempotent) fashion.
|
2005-12-22 06:39:02 +01:00
|
|
|
*/
|
2007-12-12 11:14:59 +01:00
|
|
|
if (bit_is_set(slave_exec_mode, SLAVE_EXEC_MODE_IDEMPOTENT) == 1 ||
|
|
|
|
m_table->s->db_type()->db_type == DB_TYPE_NDBCLUSTER)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
We are using REPLACE semantics and not INSERT IGNORE semantics
|
|
|
|
when writing rows, that is: new rows replace old rows. We need to
|
|
|
|
inform the storage engine that it should use this behaviour.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Tell the storage engine that we are using REPLACE semantics. */
|
|
|
|
thd->lex->duplicates= DUP_REPLACE;
|
|
|
|
|
|
|
|
/*
|
|
|
|
Pretend we're executing a REPLACE command: this is needed for
|
|
|
|
InnoDB and NDB Cluster since they are not (properly) checking the
|
|
|
|
lex->duplicates flag.
|
|
|
|
*/
|
|
|
|
thd->lex->sql_command= SQLCOM_REPLACE;
|
|
|
|
/*
|
|
|
|
Do not raise the error flag in case of hitting to an unique attribute
|
|
|
|
*/
|
|
|
|
m_table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);
|
|
|
|
/*
|
|
|
|
NDB specific: update from ndb master wrapped as Write_rows
|
|
|
|
so that the event should be applied to replace slave's row
|
|
|
|
*/
|
|
|
|
m_table->file->extra(HA_EXTRA_WRITE_CAN_REPLACE);
|
|
|
|
/*
|
|
|
|
NDB specific: if update from ndb master wrapped as Write_rows
|
|
|
|
does not find the row it's assumed idempotent binlog applying
|
|
|
|
is taking place; don't raise the error.
|
|
|
|
*/
|
|
|
|
m_table->file->extra(HA_EXTRA_IGNORE_NO_KEY);
|
|
|
|
/*
|
|
|
|
TODO: the cluster team (Tomas?) says that it's better if the engine knows
|
|
|
|
how many rows are going to be inserted, then it can allocate needed memory
|
|
|
|
from the start.
|
|
|
|
*/
|
|
|
|
}
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
We need TIMESTAMP_NO_AUTO_SET otherwise ha_write_row() will not use fill
|
|
|
|
any TIMESTAMP column with data from the row but instead will use
|
|
|
|
the event's current time.
|
|
|
|
As we replicate from TIMESTAMP to TIMESTAMP and slave has no extra
|
|
|
|
columns, we know that all TIMESTAMP columns on slave will receive explicit
|
|
|
|
data from the row, so TIMESTAMP_NO_AUTO_SET is ok.
|
|
|
|
When we allow a table without TIMESTAMP to be replicated to a table having
|
|
|
|
more columns including a TIMESTAMP column, or when we allow a TIMESTAMP
|
|
|
|
column to be replicated into a BIGINT column and the slave's table has a
|
|
|
|
TIMESTAMP column, then the slave's TIMESTAMP column will take its value
|
|
|
|
from set_time() which we called earlier (consistent with SBR). And then in
|
|
|
|
some cases we won't want TIMESTAMP_NO_AUTO_SET (will require some code to
|
|
|
|
analyze if explicit data is provided for slave's TIMESTAMP columns).
|
|
|
|
*/
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
m_table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET;
|
2009-01-14 09:27:32 +01:00
|
|
|
|
|
|
|
/* Honor next number column if present */
|
|
|
|
m_table->next_number_field= m_table->found_next_number_field;
|
2005-12-22 06:39:02 +01:00
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
int
|
2007-12-12 11:14:59 +01:00
|
|
|
Write_rows_log_event::do_after_row_operations(const Slave_reporting_capability *const,
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
int error)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
2007-05-29 15:36:05 +02:00
|
|
|
int local_error= 0;
|
2009-01-14 09:27:32 +01:00
|
|
|
m_table->next_number_field=0;
|
2007-12-12 11:14:59 +01:00
|
|
|
if (bit_is_set(slave_exec_mode, SLAVE_EXEC_MODE_IDEMPOTENT) == 1 ||
|
|
|
|
m_table->s->db_type()->db_type == DB_TYPE_NDBCLUSTER)
|
|
|
|
{
|
|
|
|
m_table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
|
|
|
|
m_table->file->extra(HA_EXTRA_WRITE_CANNOT_REPLACE);
|
|
|
|
/*
|
|
|
|
resetting the extra with
|
|
|
|
table->file->extra(HA_EXTRA_NO_IGNORE_NO_KEY);
|
|
|
|
fires bug#27077
|
|
|
|
explanation: file->reset() performs this duty
|
|
|
|
ultimately. Still todo: fix
|
|
|
|
*/
|
|
|
|
}
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
if ((local_error= m_table->file->ha_end_bulk_insert()))
|
2007-05-29 15:36:05 +02:00
|
|
|
{
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
m_table->file->print_error(local_error, MYF(0));
|
2007-05-29 15:36:05 +02:00
|
|
|
}
|
|
|
|
return error? error : local_error;
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
Check if there are more UNIQUE keys after the given key.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
last_uniq_key(TABLE *table, uint keyno)
|
|
|
|
{
|
|
|
|
while (++keyno < table->s->keys)
|
|
|
|
if (table->key_info[keyno].flags & HA_NOSAME)
|
|
|
|
return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2007-01-17 15:06:37 +01:00
|
|
|
/**
|
|
|
|
Check if an error is a duplicate key error.
|
|
|
|
|
|
|
|
This function is used to check if an error code is one of the
|
|
|
|
duplicate key error, i.e., and error code for which it is sensible
|
|
|
|
to do a <code>get_dup_key()</code> to retrieve the duplicate key.
|
|
|
|
|
|
|
|
@param errcode The error code to check.
|
|
|
|
|
|
|
|
@return <code>true</code> if the error code is such that
|
|
|
|
<code>get_dup_key()</code> will return true, <code>false</code>
|
|
|
|
otherwise.
|
|
|
|
*/
|
|
|
|
bool
|
|
|
|
is_duplicate_key_error(int errcode)
|
|
|
|
{
|
|
|
|
switch (errcode)
|
|
|
|
{
|
|
|
|
case HA_ERR_FOUND_DUPP_KEY:
|
|
|
|
case HA_ERR_FOUND_DUPP_UNIQUE:
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
/**
|
|
|
|
Write the current row into event's table.
|
2007-01-17 15:06:37 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
The row is located in the row buffer, pointed by @c m_curr_row member.
|
|
|
|
Number of columns of the row is stored in @c m_width member (it can be
|
|
|
|
different from the number of columns in the table to which we insert).
|
|
|
|
Bitmap @c m_cols indicates which columns are present in the row. It is assumed
|
|
|
|
that event's table is already open and pointed by @c m_table.
|
2005-12-22 06:39:02 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
If the same record already exists in the table it can be either overwritten
|
|
|
|
or an error is reported depending on the value of @c overwrite flag
|
|
|
|
(error reporting not yet implemented). Note that the matching record can be
|
|
|
|
different from the row we insert if we use primary keys to identify records in
|
|
|
|
the table.
|
2005-12-22 06:39:02 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
The row to be inserted can contain values only for selected columns. The
|
|
|
|
missing columns are filled with default values using @c prepare_record()
|
|
|
|
function. If a matching record is found in the table and @c overwritte is
|
|
|
|
true, the missing columns are taken from it.
|
2005-12-22 06:39:02 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
@param rli Relay log info (needed for row unpacking).
|
|
|
|
@param overwrite
|
|
|
|
Shall we overwrite if the row already exists or signal
|
|
|
|
error (currently ignored).
|
|
|
|
|
|
|
|
@returns Error code on failure, 0 on success.
|
|
|
|
|
|
|
|
This method, if successful, sets @c m_curr_row_end pointer to point at the
|
|
|
|
next row in the rows buffer. This is done when unpacking the row to be
|
|
|
|
inserted.
|
|
|
|
|
|
|
|
@note If a matching record is found, it is either updated using
|
|
|
|
@c ha_update_row() or first deleted and then new record written.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
2007-08-29 23:28:38 +02:00
|
|
|
Rows_log_event::write_row(const Relay_log_info *const rli,
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
const bool overwrite)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
DBUG_ENTER("write_row");
|
|
|
|
DBUG_ASSERT(m_table != NULL && thd != NULL);
|
2005-12-22 06:39:02 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
TABLE *table= m_table; // pointer to event's table
|
2005-12-22 06:39:02 +01:00
|
|
|
int error;
|
|
|
|
int keynum;
|
|
|
|
auto_afree_ptr<char> key(NULL);
|
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
/* fill table->record[0] with default values */
|
|
|
|
|
2008-01-31 13:54:03 +01:00
|
|
|
if ((error= prepare_record(table, m_width,
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
TRUE /* check if columns have def. values */)))
|
|
|
|
DBUG_RETURN(error);
|
|
|
|
|
|
|
|
/* unpack row into table->record[0] */
|
|
|
|
error= unpack_current_row(rli); // TODO: how to handle errors?
|
2008-09-26 11:39:47 +02:00
|
|
|
if (m_curr_row == m_rows_buf)
|
|
|
|
{
|
|
|
|
/* this is the first row to be inserted, we estimate the rows with
|
|
|
|
the size of the first row and use that value to initialize
|
|
|
|
storage engine for bulk insertion */
|
|
|
|
ulong estimated_rows= (m_rows_end - m_curr_row) / (m_curr_row_end - m_curr_row);
|
|
|
|
m_table->file->ha_start_bulk_insert(estimated_rows);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-03-20 08:52:01 +01:00
|
|
|
#ifndef DBUG_OFF
|
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
|
|
|
DBUG_DUMP("record[0]", table->record[0], table->s->reclength);
|
2007-03-20 08:52:01 +01:00
|
|
|
DBUG_PRINT_BITSET("debug", "write_set = %s", table->write_set);
|
|
|
|
DBUG_PRINT_BITSET("debug", "read_set = %s", table->read_set);
|
|
|
|
#endif
|
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
/*
|
|
|
|
Try to write record. If a corresponding record already exists in the table,
|
|
|
|
we try to change it using ha_update_row() if possible. Otherwise we delete
|
|
|
|
it and repeat the whole process again.
|
|
|
|
|
|
|
|
TODO: Add safety measures against infinite looping.
|
|
|
|
*/
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
while ((error= table->file->ha_write_row(table->record[0])))
|
|
|
|
{
|
2007-12-12 11:14:59 +01:00
|
|
|
if (error == HA_ERR_LOCK_DEADLOCK ||
|
|
|
|
error == HA_ERR_LOCK_WAIT_TIMEOUT ||
|
|
|
|
(keynum= table->file->get_dup_key(error)) < 0 ||
|
|
|
|
!overwrite)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
2007-12-12 11:14:59 +01:00
|
|
|
DBUG_PRINT("info",("get_dup_key returns %d)", keynum));
|
2007-07-06 12:39:03 +02:00
|
|
|
/*
|
2007-12-12 11:14:59 +01:00
|
|
|
Deadlock, waiting for lock or just an error from the handler
|
|
|
|
such as HA_ERR_FOUND_DUPP_KEY when overwrite is false.
|
|
|
|
Retrieval of the duplicate key number may fail
|
2007-07-06 12:39:03 +02:00
|
|
|
- either because the error was not "duplicate key" error
|
|
|
|
- or because the information which key is not available
|
|
|
|
*/
|
2007-12-12 11:14:59 +01:00
|
|
|
table->file->print_error(error, MYF(0));
|
2007-01-17 15:06:37 +01:00
|
|
|
DBUG_RETURN(error);
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
We need to retrieve the old row into record[1] to be able to
|
|
|
|
either update or delete the offending record. We either:
|
|
|
|
|
|
|
|
- use rnd_pos() with a row-id (available as dupp_row) to the
|
|
|
|
offending row, if that is possible (MyISAM and Blackhole), or else
|
|
|
|
|
|
|
|
- use index_read_idx() with the key that is duplicated, to
|
|
|
|
retrieve the offending row.
|
|
|
|
*/
|
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->file->ha_table_flags() & HA_DUPLICATE_POS)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
DBUG_PRINT("info",("Locating offending record using rnd_pos()"));
|
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
|
|
|
error= table->file->rnd_pos(table->record[1], table->file->dup_ref);
|
2005-12-22 06:39:02 +01:00
|
|
|
if (error)
|
2007-01-17 15:06:37 +01:00
|
|
|
{
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
DBUG_PRINT("info",("rnd_pos() returns error %d",error));
|
2008-10-20 20:50:08 +02:00
|
|
|
if (error == HA_ERR_RECORD_DELETED)
|
|
|
|
error= HA_ERR_KEY_NOT_FOUND;
|
2007-01-17 15:06:37 +01:00
|
|
|
table->file->print_error(error, MYF(0));
|
2006-05-03 15:00:38 +02:00
|
|
|
DBUG_RETURN(error);
|
2007-01-17 15:06:37 +01:00
|
|
|
}
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
DBUG_PRINT("info",("Locating offending record using index_read_idx()"));
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
if (table->file->extra(HA_EXTRA_FLUSH_CACHE))
|
|
|
|
{
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
DBUG_PRINT("info",("Error when setting HA_EXTRA_FLUSH_CACHE"));
|
2006-05-03 15:00:38 +02:00
|
|
|
DBUG_RETURN(my_errno);
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (key.get() == NULL)
|
|
|
|
{
|
|
|
|
key.assign(static_cast<char*>(my_alloca(table->s->max_unique_length)));
|
|
|
|
if (key.get() == NULL)
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
{
|
|
|
|
DBUG_PRINT("info",("Can't allocate key buffer"));
|
2006-05-03 15:00:38 +02:00
|
|
|
DBUG_RETURN(ENOMEM);
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
}
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
|
2007-08-14 14:20:05 +02:00
|
|
|
key_copy((uchar*)key.get(), table->record[0], table->key_info + keynum,
|
|
|
|
0);
|
2007-08-13 15:11:25 +02:00
|
|
|
error= table->file->index_read_idx_map(table->record[1], keynum,
|
|
|
|
(const uchar*)key.get(),
|
|
|
|
HA_WHOLE_KEY,
|
|
|
|
HA_READ_KEY_EXACT);
|
2005-12-22 06:39:02 +01:00
|
|
|
if (error)
|
2007-01-17 15:06:37 +01:00
|
|
|
{
|
2008-10-20 20:50:08 +02:00
|
|
|
DBUG_PRINT("info",("index_read_idx() returns %s", HA_ERR(error)));
|
|
|
|
if (error == HA_ERR_RECORD_DELETED)
|
|
|
|
error= HA_ERR_KEY_NOT_FOUND;
|
2007-01-17 15:06:37 +01:00
|
|
|
table->file->print_error(error, MYF(0));
|
2006-05-03 15:00:38 +02:00
|
|
|
DBUG_RETURN(error);
|
2007-01-17 15:06:37 +01:00
|
|
|
}
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
Now, record[1] should contain the offending row. That
|
2005-12-22 06:39:02 +01:00
|
|
|
will enable us to update it or, alternatively, delete it (so
|
|
|
|
that we can insert the new row afterwards).
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
*/
|
2005-12-22 06:39:02 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
/*
|
|
|
|
If row is incomplete we will use the record found to fill
|
|
|
|
missing columns.
|
2006-05-03 15:00:38 +02:00
|
|
|
*/
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
if (!get_flags(COMPLETE_ROWS_F))
|
|
|
|
{
|
|
|
|
restore_record(table,record[1]);
|
|
|
|
error= unpack_current_row(rli);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifndef DBUG_OFF
|
|
|
|
DBUG_PRINT("debug",("preparing for update: before and after image"));
|
|
|
|
DBUG_DUMP("record[1] (before)", table->record[1], table->s->reclength);
|
|
|
|
DBUG_DUMP("record[0] (after)", table->record[0], table->s->reclength);
|
|
|
|
#endif
|
2006-11-23 10:15:02 +01:00
|
|
|
|
2006-05-03 15:00:38 +02:00
|
|
|
/*
|
2005-12-22 06:39:02 +01:00
|
|
|
REPLACE is defined as either INSERT or DELETE + INSERT. If
|
|
|
|
possible, we can replace it with an UPDATE, but that will not
|
|
|
|
work on InnoDB if FOREIGN KEY checks are necessary.
|
|
|
|
|
|
|
|
I (Matz) am not sure of the reason for the last_uniq_key()
|
|
|
|
check as, but I'm guessing that it's something along the
|
|
|
|
following lines.
|
|
|
|
|
|
|
|
Suppose that we got the duplicate key to be a key that is not
|
|
|
|
the last unique key for the table and we perform an update:
|
|
|
|
then there might be another key for which the unique check will
|
|
|
|
fail, so we're better off just deleting the row and inserting
|
|
|
|
the correct row.
|
|
|
|
*/
|
|
|
|
if (last_uniq_key(table, keynum) &&
|
|
|
|
!table->file->referenced_by_foreign_key())
|
|
|
|
{
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
DBUG_PRINT("info",("Updating row using ha_update_row()"));
|
2005-12-22 06:39:02 +01:00
|
|
|
error=table->file->ha_update_row(table->record[1],
|
|
|
|
table->record[0]);
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
switch (error) {
|
|
|
|
|
|
|
|
case HA_ERR_RECORD_IS_THE_SAME:
|
|
|
|
DBUG_PRINT("info",("ignoring HA_ERR_RECORD_IS_THE_SAME error from"
|
|
|
|
" ha_update_row()"));
|
2007-06-28 15:07:55 +02:00
|
|
|
error= 0;
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
|
|
|
|
case 0:
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
DBUG_PRINT("info",("ha_update_row() returns error %d",error));
|
2007-01-17 15:06:37 +01:00
|
|
|
table->file->print_error(error, MYF(0));
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
}
|
|
|
|
|
2006-05-03 15:00:38 +02:00
|
|
|
DBUG_RETURN(error);
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
DBUG_PRINT("info",("Deleting offending row and trying to write new one again"));
|
2005-12-22 06:39:02 +01:00
|
|
|
if ((error= table->file->ha_delete_row(table->record[1])))
|
2007-01-17 15:06:37 +01:00
|
|
|
{
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
DBUG_PRINT("info",("ha_delete_row() returns error %d",error));
|
2007-01-17 15:06:37 +01:00
|
|
|
table->file->print_error(error, MYF(0));
|
2006-05-03 15:00:38 +02:00
|
|
|
DBUG_RETURN(error);
|
2007-01-17 15:06:37 +01:00
|
|
|
}
|
2005-12-22 06:39:02 +01:00
|
|
|
/* Will retry ha_write_row() with the offending row removed. */
|
|
|
|
}
|
|
|
|
}
|
2007-01-17 15:06:37 +01:00
|
|
|
|
2006-05-03 15:00:38 +02:00
|
|
|
DBUG_RETURN(error);
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
int
|
2007-08-29 23:28:38 +02:00
|
|
|
Write_rows_log_event::do_exec_row(const Relay_log_info *const rli)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
DBUG_ASSERT(m_table != NULL);
|
2007-12-12 11:14:59 +01:00
|
|
|
int error=
|
|
|
|
write_row(rli, /* if 1 then overwrite */
|
|
|
|
bit_is_set(slave_exec_mode, SLAVE_EXEC_MODE_IDEMPOTENT) == 1);
|
|
|
|
|
2007-12-12 16:21:01 +01:00
|
|
|
if (error && !thd->is_error())
|
|
|
|
{
|
|
|
|
DBUG_ASSERT(0);
|
|
|
|
my_error(ER_UNKNOWN_ERROR, MYF(0));
|
|
|
|
}
|
2007-12-12 11:14:59 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
return error;
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
#endif /* !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) */
|
|
|
|
|
|
|
|
#ifdef MYSQL_CLIENT
|
|
|
|
void Write_rows_log_event::print(FILE *file, PRINT_EVENT_INFO* print_event_info)
|
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
Rows_log_event::print_helper(file, print_event_info, "Write_rows");
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/**************************************************************************
|
|
|
|
Delete_rows_log_event member functions
|
|
|
|
**************************************************************************/
|
|
|
|
|
|
|
|
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
|
2006-02-24 15:38:20 +01:00
|
|
|
/*
|
|
|
|
Compares table->record[0] and table->record[1]
|
|
|
|
|
|
|
|
Returns TRUE if different.
|
|
|
|
*/
|
|
|
|
static bool record_compare(TABLE *table)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
2007-03-20 08:52:01 +01:00
|
|
|
/*
|
|
|
|
Need to set the X bit and the filler bits in both records since
|
|
|
|
there are engines that do not set it correctly.
|
|
|
|
|
|
|
|
In addition, since MyISAM checks that one hasn't tampered with the
|
|
|
|
record, it is necessary to restore the old bytes into the record
|
|
|
|
after doing the comparison.
|
|
|
|
|
|
|
|
TODO[record format ndb]: Remove it once NDB returns correct
|
|
|
|
records. Check that the other engines also return correct records.
|
|
|
|
*/
|
|
|
|
|
2007-10-30 21:17:19 +01:00
|
|
|
DBUG_DUMP("record[0]", table->record[0], table->s->reclength);
|
|
|
|
DBUG_DUMP("record[1]", table->record[1], table->s->reclength);
|
|
|
|
|
2007-03-20 08:52:01 +01:00
|
|
|
bool result= FALSE;
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar saved_x[2], saved_filler[2];
|
2007-03-20 08:52:01 +01:00
|
|
|
|
|
|
|
if (table->s->null_bytes > 0)
|
|
|
|
{
|
|
|
|
for (int i = 0 ; i < 2 ; ++i)
|
|
|
|
{
|
|
|
|
saved_x[i]= table->record[i][0];
|
|
|
|
saved_filler[i]= table->record[i][table->s->null_bytes - 1];
|
|
|
|
table->record[i][0]|= 1U;
|
|
|
|
table->record[i][table->s->null_bytes - 1]|=
|
|
|
|
256U - (1U << table->s->last_null_bit_pos);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-02-24 15:38:20 +01:00
|
|
|
if (table->s->blob_fields + table->s->varchar_fields == 0)
|
2007-03-20 08:52:01 +01:00
|
|
|
{
|
|
|
|
result= cmp_record(table,record[1]);
|
|
|
|
goto record_compare_exit;
|
|
|
|
}
|
|
|
|
|
2006-02-24 15:38:20 +01:00
|
|
|
/* Compare null bits */
|
|
|
|
if (memcmp(table->null_flags,
|
|
|
|
table->null_flags+table->s->rec_buff_length,
|
|
|
|
table->s->null_bytes))
|
2007-03-20 08:52:01 +01:00
|
|
|
{
|
|
|
|
result= TRUE; // Diff in NULL value
|
|
|
|
goto record_compare_exit;
|
|
|
|
}
|
|
|
|
|
2006-02-24 15:38:20 +01:00
|
|
|
/* Compare updated fields */
|
|
|
|
for (Field **ptr=table->field ; *ptr ; ptr++)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
2006-02-24 15:38:20 +01:00
|
|
|
if ((*ptr)->cmp_binary_offset(table->s->rec_buff_length))
|
2007-03-20 08:52:01 +01:00
|
|
|
{
|
|
|
|
result= TRUE;
|
|
|
|
goto record_compare_exit;
|
|
|
|
}
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
2007-03-20 08:52:01 +01:00
|
|
|
|
|
|
|
record_compare_exit:
|
|
|
|
/*
|
|
|
|
Restore the saved bytes.
|
|
|
|
|
|
|
|
TODO[record format ndb]: Remove this code once NDB returns the
|
|
|
|
correct record format.
|
|
|
|
*/
|
|
|
|
if (table->s->null_bytes > 0)
|
|
|
|
{
|
|
|
|
for (int i = 0 ; i < 2 ; ++i)
|
|
|
|
{
|
|
|
|
table->record[i][0]= saved_x[i];
|
|
|
|
table->record[i][table->s->null_bytes - 1]= saved_filler[i];
|
|
|
|
}
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
2007-03-20 08:52:01 +01:00
|
|
|
|
|
|
|
return result;
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
/**
|
|
|
|
Locate the current row in event's table.
|
2005-12-22 06:39:02 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
The current row is pointed by @c m_curr_row. Member @c m_width tells how many
|
|
|
|
columns are there in the row (this can be differnet from the number of columns
|
|
|
|
in the table). It is assumed that event's table is already open and pointed
|
|
|
|
by @c m_table.
|
2006-11-20 21:27:39 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
If a corresponding record is found in the table it is stored in
|
|
|
|
@c m_table->record[0]. Note that when record is located based on a primary
|
|
|
|
key, it is possible that the record found differs from the row being located.
|
2006-11-20 21:27:39 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
If no key is specified or table does not have keys, a table scan is used to
|
|
|
|
find the row. In that case the row should be complete and contain values for
|
|
|
|
all columns. However, it can still be shorter than the table, i.e. the table
|
|
|
|
can contain extra columns not present in the row. It is also possible that
|
|
|
|
the table has fewer columns than the row being located.
|
2006-11-20 21:27:39 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
@returns Error code on failure, 0 on success.
|
|
|
|
|
|
|
|
@post In case of success @c m_table->record[0] contains the record found.
|
|
|
|
Also, the internal "cursor" of the table is positioned at the record found.
|
2006-11-20 21:27:39 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
@note If the engine allows random access of the records, a combination of
|
|
|
|
@c position() and @c rnd_pos() will be used.
|
2005-12-22 06:39:02 +01:00
|
|
|
*/
|
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
|
|
|
|
2007-08-29 23:28:38 +02:00
|
|
|
int Rows_log_event::find_row(const Relay_log_info *rli)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
2007-10-30 21:17:19 +01:00
|
|
|
DBUG_ENTER("Rows_log_event::find_row");
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
|
|
|
|
DBUG_ASSERT(m_table && m_table->in_use != NULL);
|
2005-12-22 06:39:02 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
TABLE *table= m_table;
|
2008-01-31 13:54:03 +01:00
|
|
|
int error= 0;
|
2005-12-22 06:39:02 +01:00
|
|
|
|
2008-01-31 13:54:03 +01:00
|
|
|
/*
|
|
|
|
rpl_row_tabledefs.test specifies that
|
|
|
|
if the extra field on the slave does not have a default value
|
|
|
|
and this is okay with Delete or Update events.
|
|
|
|
Todo: fix wl3228 hld that requires defauls for all types of events
|
|
|
|
*/
|
|
|
|
|
|
|
|
prepare_record(table, m_width, FALSE);
|
|
|
|
error= unpack_current_row(rli);
|
2005-12-22 06:39:02 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
#ifndef DBUG_OFF
|
|
|
|
DBUG_PRINT("info",("looking for the following record"));
|
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
|
|
|
DBUG_DUMP("record[0]", table->record[0], table->s->reclength);
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
#endif
|
2007-02-12 16:46:42 +01:00
|
|
|
|
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->file->ha_table_flags() & HA_PRIMARY_KEY_REQUIRED_FOR_POSITION) &&
|
|
|
|
table->s->primary_key < MAX_KEY)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
Use a more efficient method to fetch the record given by
|
|
|
|
table->record[0] if the engine allows it. We first compute a
|
|
|
|
row reference using the position() member function (it will be
|
|
|
|
stored in table->file->ref) and the use rnd_pos() to position
|
2006-03-23 20:13:44 +01:00
|
|
|
the "cursor" (i.e., record[0] in this case) at the correct row.
|
2006-11-21 13:57:52 +01:00
|
|
|
|
|
|
|
TODO: Add a check that the correct record has been fetched by
|
|
|
|
comparing with the original record. Take into account that the
|
|
|
|
record on the master and slave can be of different
|
|
|
|
length. Something along these lines should work:
|
|
|
|
|
|
|
|
ADD>>> store_record(table,record[1]);
|
|
|
|
int error= table->file->rnd_pos(table->record[0], table->file->ref);
|
|
|
|
ADD>>> DBUG_ASSERT(memcmp(table->record[1], table->record[0],
|
|
|
|
table->s->reclength) == 0);
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
*/
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
DBUG_PRINT("info",("locating record using primary key (position)"));
|
2007-09-07 15:41:49 +02:00
|
|
|
int error= table->file->rnd_pos_by_record(table->record[0]);
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
if (error)
|
|
|
|
{
|
|
|
|
DBUG_PRINT("info",("rnd_pos returns error %d",error));
|
2008-10-20 20:50:08 +02:00
|
|
|
if (error == HA_ERR_RECORD_DELETED)
|
|
|
|
error= HA_ERR_KEY_NOT_FOUND;
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
table->file->print_error(error, MYF(0));
|
|
|
|
}
|
2006-11-20 21:27:39 +01:00
|
|
|
DBUG_RETURN(error);
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
|
2007-08-27 20:22:04 +02:00
|
|
|
// We can't use position() - try other methods.
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
We need to retrieve all fields
|
|
|
|
TODO: Move this out from this function to main loop
|
|
|
|
*/
|
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
|
|
|
table->use_all_columns();
|
2006-01-12 19:51:02 +01:00
|
|
|
|
2007-08-27 20:22:04 +02:00
|
|
|
/*
|
|
|
|
Save copy of the record in table->record[1]. It might be needed
|
|
|
|
later if linear search is used to find exact match.
|
|
|
|
*/
|
|
|
|
store_record(table,record[1]);
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
if (table->s->keys > 0)
|
|
|
|
{
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
DBUG_PRINT("info",("locating record using primary key (index_read)"));
|
|
|
|
|
2006-05-11 11:09:58 +02:00
|
|
|
/* We have a key: search the table using the index */
|
2006-06-04 20:05:22 +02:00
|
|
|
if (!table->file->inited && (error= table->file->ha_index_init(0, FALSE)))
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
{
|
|
|
|
DBUG_PRINT("info",("ha_index_init returns error %d",error));
|
|
|
|
table->file->print_error(error, MYF(0));
|
2008-01-15 17:01:58 +01:00
|
|
|
goto err;
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
}
|
2006-09-21 18:05:02 +02:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
/* Fill key data for the row */
|
|
|
|
|
|
|
|
DBUG_ASSERT(m_key);
|
|
|
|
key_copy(m_key, table->record[0], table->key_info, 0);
|
|
|
|
|
|
|
|
/*
|
|
|
|
Don't print debug messages when running valgrind since they can
|
|
|
|
trigger false warnings.
|
|
|
|
*/
|
2006-11-21 13:57:52 +01:00
|
|
|
#ifndef HAVE_purify
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
DBUG_DUMP("key data", m_key, table->key_info->key_length);
|
2006-11-21 13:57:52 +01:00
|
|
|
#endif
|
|
|
|
|
2006-05-11 11:09:58 +02:00
|
|
|
/*
|
|
|
|
We need to set the null bytes to ensure that the filler bit are
|
|
|
|
all set when returning. There are storage engines that just set
|
|
|
|
the necessary bits on the bytes and don't set the filler bits
|
|
|
|
correctly.
|
|
|
|
*/
|
2008-10-02 11:02:38 +02:00
|
|
|
if (table->s->null_bytes > 0)
|
|
|
|
table->record[0][table->s->null_bytes - 1]|=
|
|
|
|
256U - (1U << table->s->last_null_bit_pos);
|
|
|
|
|
2007-08-27 20:22:04 +02:00
|
|
|
if ((error= table->file->index_read_map(table->record[0], m_key,
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
HA_WHOLE_KEY,
|
2007-08-13 15:11:25 +02:00
|
|
|
HA_READ_KEY_EXACT)))
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
DBUG_PRINT("info",("no record matching the key found in the table"));
|
2008-10-20 20:50:08 +02:00
|
|
|
if (error == HA_ERR_RECORD_DELETED)
|
|
|
|
error= HA_ERR_KEY_NOT_FOUND;
|
2005-12-22 06:39:02 +01:00
|
|
|
table->file->print_error(error, MYF(0));
|
2006-05-11 11:09:58 +02:00
|
|
|
table->file->ha_index_end();
|
2008-01-15 17:01:58 +01:00
|
|
|
goto err;
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
|
2006-11-21 13:57:52 +01:00
|
|
|
/*
|
|
|
|
Don't print debug messages when running valgrind since they can
|
|
|
|
trigger false warnings.
|
|
|
|
*/
|
|
|
|
#ifndef HAVE_purify
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
DBUG_PRINT("info",("found first matching record"));
|
|
|
|
DBUG_DUMP("record[0]", table->record[0], table->s->reclength);
|
2006-11-21 13:57:52 +01:00
|
|
|
#endif
|
2005-12-22 06:39:02 +01:00
|
|
|
/*
|
|
|
|
Below is a minor "optimization". If the key (i.e., key number
|
|
|
|
0) has the HA_NOSAME flag set, we know that we have found the
|
|
|
|
correct record (since there can be no duplicates); otherwise, we
|
|
|
|
have to compare the record with the one found to see if it is
|
|
|
|
the correct one.
|
|
|
|
|
|
|
|
CAVEAT! This behaviour is essential for the replication of,
|
|
|
|
e.g., the mysql.proc table since the correct record *shall* be
|
|
|
|
found using the primary key *only*. There shall be no
|
|
|
|
comparison of non-PK columns to decide if the correct record is
|
|
|
|
found. I can see no scenario where it would be incorrect to
|
|
|
|
chose the row to change only using a PK or an UNNI.
|
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
|
|
|
*/
|
2005-12-22 06:39:02 +01:00
|
|
|
if (table->key_info->flags & HA_NOSAME)
|
2006-05-11 11:09:58 +02:00
|
|
|
{
|
|
|
|
table->file->ha_index_end();
|
2008-01-15 17:01:58 +01:00
|
|
|
goto ok;
|
2006-05-11 11:09:58 +02:00
|
|
|
}
|
2005-12-22 06:39:02 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
/*
|
|
|
|
In case key is not unique, we still have to iterate over records found
|
2007-08-27 20:22:04 +02:00
|
|
|
and find the one which is identical to the row given. A copy of the
|
|
|
|
record we are looking for is stored in record[1].
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
*/
|
|
|
|
DBUG_PRINT("info",("non-unique index, scanning it to find matching record"));
|
|
|
|
|
2006-02-24 15:38:20 +01:00
|
|
|
while (record_compare(table))
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
2006-03-07 08:33:20 +01:00
|
|
|
/*
|
|
|
|
We need to set the null bytes to ensure that the filler bit
|
|
|
|
are all set when returning. There are storage engines that
|
|
|
|
just set the necessary bits on the bytes and don't set the
|
|
|
|
filler bits correctly.
|
2007-03-20 08:52:01 +01:00
|
|
|
|
|
|
|
TODO[record format ndb]: Remove this code once NDB returns the
|
|
|
|
correct record format.
|
2006-03-07 08:33:20 +01:00
|
|
|
*/
|
2007-03-07 11:54:32 +01:00
|
|
|
if (table->s->null_bytes > 0)
|
|
|
|
{
|
2007-08-27 20:22:04 +02:00
|
|
|
table->record[0][table->s->null_bytes - 1]|=
|
2007-03-07 11:54:32 +01:00
|
|
|
256U - (1U << table->s->last_null_bit_pos);
|
|
|
|
}
|
|
|
|
|
2008-10-20 20:50:08 +02:00
|
|
|
while ((error= table->file->index_next(table->record[0])))
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
2008-10-20 20:50:08 +02:00
|
|
|
/* We just skip records that has already been deleted */
|
|
|
|
if (error == HA_ERR_RECORD_DELETED)
|
|
|
|
continue;
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
DBUG_PRINT("info",("no record matching the given row found"));
|
|
|
|
table->file->print_error(error, MYF(0));
|
2006-05-11 11:09:58 +02:00
|
|
|
table->file->ha_index_end();
|
2008-01-15 17:01:58 +01:00
|
|
|
goto err;
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
}
|
2006-05-11 11:09:58 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
Have to restart the scan to be able to fetch the next row.
|
|
|
|
*/
|
|
|
|
table->file->ha_index_end();
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
DBUG_PRINT("info",("locating record using table scan (rnd_next)"));
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
int restart_count= 0; // Number of times scanning has restarted from top
|
2006-05-11 11:09:58 +02:00
|
|
|
|
|
|
|
/* We don't have a key: search the table using rnd_next() */
|
|
|
|
if ((error= table->file->ha_rnd_init(1)))
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
{
|
|
|
|
DBUG_PRINT("info",("error initializing table scan"
|
|
|
|
" (ha_rnd_init returns %d)",error));
|
|
|
|
table->file->print_error(error, MYF(0));
|
2008-01-15 17:01:58 +01:00
|
|
|
goto err;
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
}
|
2006-05-11 11:09:58 +02:00
|
|
|
|
|
|
|
/* Continue until we find the right record or have made a full loop */
|
2005-12-22 06:39:02 +01:00
|
|
|
do
|
|
|
|
{
|
2008-10-20 20:50:08 +02:00
|
|
|
restart_rnd_next:
|
2007-08-27 20:22:04 +02:00
|
|
|
error= table->file->rnd_next(table->record[0]);
|
2006-09-21 18:05:02 +02:00
|
|
|
|
2008-10-20 20:50:08 +02:00
|
|
|
DBUG_PRINT("info", ("error: %s", HA_ERR(error)));
|
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
|
|
|
switch (error) {
|
2006-09-21 18:05:02 +02:00
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
case 0:
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
break;
|
2005-12-22 06:39:02 +01:00
|
|
|
|
2008-10-20 20:50:08 +02:00
|
|
|
/*
|
|
|
|
If the record was deleted, we pick the next one without doing
|
|
|
|
any comparisons.
|
|
|
|
*/
|
|
|
|
case HA_ERR_RECORD_DELETED:
|
|
|
|
goto restart_rnd_next;
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
case HA_ERR_END_OF_FILE:
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
if (++restart_count < 2)
|
|
|
|
table->file->ha_rnd_init(1);
|
|
|
|
break;
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
default:
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
DBUG_PRINT("info", ("Failed to get next record"
|
|
|
|
" (rnd_next returns %d)",error));
|
|
|
|
table->file->print_error(error, MYF(0));
|
2006-05-11 11:09:58 +02:00
|
|
|
table->file->ha_rnd_end();
|
2008-01-15 17:01:58 +01:00
|
|
|
goto err;
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
}
|
2006-02-24 15:38:20 +01:00
|
|
|
while (restart_count < 2 && record_compare(table));
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
Note: above record_compare will take into accout all record fields
|
|
|
|
which might be incorrect in case a partial row was given in the event
|
|
|
|
*/
|
2005-12-22 06:39:02 +01:00
|
|
|
|
2006-05-11 11:09:58 +02:00
|
|
|
/*
|
|
|
|
Have to restart the scan to be able to fetch the next row.
|
|
|
|
*/
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
if (restart_count == 2)
|
|
|
|
DBUG_PRINT("info", ("Record not found"));
|
2007-08-27 20:22:04 +02:00
|
|
|
else
|
|
|
|
DBUG_DUMP("record found", table->record[0], table->s->reclength);
|
2006-05-11 11:09:58 +02:00
|
|
|
table->file->ha_rnd_end();
|
|
|
|
|
2008-10-20 20:50:08 +02:00
|
|
|
DBUG_ASSERT(error == HA_ERR_END_OF_FILE || error == 0);
|
2008-01-15 17:01:58 +01:00
|
|
|
goto err;
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
2008-01-15 17:01:58 +01:00
|
|
|
ok:
|
|
|
|
table->default_column_bitmaps();
|
2005-12-22 06:39:02 +01:00
|
|
|
DBUG_RETURN(0);
|
2008-01-15 17:01:58 +01:00
|
|
|
|
|
|
|
err:
|
|
|
|
table->default_column_bitmaps();
|
|
|
|
DBUG_RETURN(error);
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
Constructor used to build an event for writing to the binary log.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef MYSQL_CLIENT
|
|
|
|
Delete_rows_log_event::Delete_rows_log_event(THD *thd_arg, TABLE *tbl_arg,
|
|
|
|
ulong tid, MY_BITMAP const *cols,
|
|
|
|
bool is_transactional)
|
|
|
|
: Rows_log_event(thd_arg, tbl_arg, tid, cols, is_transactional)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif /* #if !defined(MYSQL_CLIENT) */
|
|
|
|
|
|
|
|
/*
|
|
|
|
Constructor used by slave to read the event from the binary log.
|
|
|
|
*/
|
|
|
|
#ifdef HAVE_REPLICATION
|
|
|
|
Delete_rows_log_event::Delete_rows_log_event(const char *buf, uint event_len,
|
|
|
|
const Format_description_log_event
|
|
|
|
*description_event)
|
|
|
|
: Rows_log_event(buf, event_len, DELETE_ROWS_EVENT, description_event)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
|
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
int
|
|
|
|
Delete_rows_log_event::do_before_row_operations(const Slave_reporting_capability *const)
|
|
|
|
{
|
|
|
|
if ((m_table->file->ha_table_flags() & HA_PRIMARY_KEY_REQUIRED_FOR_POSITION) &&
|
|
|
|
m_table->s->primary_key < MAX_KEY)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
|
|
|
/*
|
2007-08-28 10:14:45 +02:00
|
|
|
We don't need to allocate any memory for m_key since it is not used.
|
2005-12-22 06:39:02 +01:00
|
|
|
*/
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
if (m_table->s->keys > 0)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
// Allocate buffer for key searches
|
|
|
|
m_key= (uchar*)my_malloc(m_table->key_info->key_length, MYF(MY_WME));
|
|
|
|
if (!m_key)
|
|
|
|
return HA_ERR_OUT_OF_MEM;
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
return 0;
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
int
|
|
|
|
Delete_rows_log_event::do_after_row_operations(const Slave_reporting_capability *const,
|
|
|
|
int error)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
|
|
|
/*error= ToDo:find out what this should really be, this triggers close_scan in nbd, returning error?*/
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
m_table->file->ha_index_or_rnd_end();
|
|
|
|
my_free(m_key, MYF(MY_ALLOW_ZERO_PTR));
|
2005-12-30 13:32:33 +01:00
|
|
|
m_key= NULL;
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2007-08-29 23:28:38 +02:00
|
|
|
int Delete_rows_log_event::do_exec_row(const Relay_log_info *const rli)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
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
|
|
|
int error;
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
DBUG_ASSERT(m_table != NULL);
|
2005-12-22 06:39:02 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
if (!(error= find_row(rli)))
|
2006-06-04 20:05:22 +02:00
|
|
|
{
|
|
|
|
/*
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
Delete the record found, located in record[0]
|
2006-06-04 20:05:22 +02:00
|
|
|
*/
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
error= m_table->file->ha_delete_row(m_table->record[0]);
|
2006-04-12 21:19:24 +02:00
|
|
|
}
|
2005-12-22 06:39:02 +01:00
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) */
|
|
|
|
|
|
|
|
#ifdef MYSQL_CLIENT
|
|
|
|
void Delete_rows_log_event::print(FILE *file,
|
|
|
|
PRINT_EVENT_INFO* print_event_info)
|
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
Rows_log_event::print_helper(file, print_event_info, "Delete_rows");
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
/**************************************************************************
|
|
|
|
Update_rows_log_event member functions
|
|
|
|
**************************************************************************/
|
|
|
|
|
|
|
|
/*
|
|
|
|
Constructor used to build an event for writing to the binary log.
|
|
|
|
*/
|
|
|
|
#if !defined(MYSQL_CLIENT)
|
|
|
|
Update_rows_log_event::Update_rows_log_event(THD *thd_arg, TABLE *tbl_arg,
|
2007-03-27 12:17:51 +02:00
|
|
|
ulong tid,
|
|
|
|
MY_BITMAP const *cols_bi,
|
|
|
|
MY_BITMAP const *cols_ai,
|
|
|
|
bool is_transactional)
|
|
|
|
: Rows_log_event(thd_arg, tbl_arg, tid, cols_bi, is_transactional)
|
|
|
|
{
|
|
|
|
init(cols_ai);
|
|
|
|
}
|
|
|
|
|
|
|
|
Update_rows_log_event::Update_rows_log_event(THD *thd_arg, TABLE *tbl_arg,
|
|
|
|
ulong tid,
|
|
|
|
MY_BITMAP const *cols,
|
2005-12-22 06:39:02 +01:00
|
|
|
bool is_transactional)
|
|
|
|
: Rows_log_event(thd_arg, tbl_arg, tid, cols, is_transactional)
|
|
|
|
{
|
2007-03-27 12:17:51 +02:00
|
|
|
init(cols);
|
|
|
|
}
|
|
|
|
|
|
|
|
void Update_rows_log_event::init(MY_BITMAP const *cols)
|
|
|
|
{
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
/* if bitmap_init fails, caught in is_valid() */
|
2007-03-27 12:17:51 +02:00
|
|
|
if (likely(!bitmap_init(&m_cols_ai,
|
|
|
|
m_width <= sizeof(m_bitbuf_ai)*8 ? m_bitbuf_ai : NULL,
|
Bug#19259 rpl_ndb_dd_partitions failed on Solaris
Actually, this testcase will fail generally on all testing platforms.
The bugs come from the inconsistent bitmap between rpl master and slave.
In log_event.cc, the n_bits of m_cols and m_cols_ai are intialized with octal-ceiling
m_width, in fact, their n_bits should be equal to m_width.
Wrong n_bits will cause bitmap_bits_set() get incorrect value in unpack_row()
in rpl_record.cc,
then an assertion in unpack_row() will fail and crash sql thread.
DBUG_ASSERT(null_ptr == row_data + master_null_byte_count);
Meanwhile, because of binlog_prepare_pending_rows_event() changed with correct
m_cols, some results of specific testcases should be updated:
binlog_multi_engine.test
ndb_binlog_multi.test
rpl_ndb_dd_partitions.test
rpl_ndb_log.test
rpl_truncate_7ndb.test
rpl_truncate_7ndb_2.test
In addition, to ensure rows replication correct between master and slave after the patch,
two 'select * from t1' are added in extra/rpl_tests/rpl_log.test, and some testcases include
rpl_log.test, therefore, the results of these testcases should be updated likewise:
rpl_stm_log.test
rpl_row_log.test
rpl_ndb_log.test
rpl_row_log_innodb.test
Totally, results of nine testcases are updated.
2007-07-12 09:19:29 +02:00
|
|
|
m_width,
|
2007-03-27 12:17:51 +02:00
|
|
|
false)))
|
|
|
|
{
|
|
|
|
/* Cols can be zero if this is a dummy binrows event */
|
|
|
|
if (likely(cols != NULL))
|
Bug#19259 rpl_ndb_dd_partitions failed on Solaris
Actually, this testcase will fail generally on all testing platforms.
The bugs come from the inconsistent bitmap between rpl master and slave.
In log_event.cc, the n_bits of m_cols and m_cols_ai are intialized with octal-ceiling
m_width, in fact, their n_bits should be equal to m_width.
Wrong n_bits will cause bitmap_bits_set() get incorrect value in unpack_row()
in rpl_record.cc,
then an assertion in unpack_row() will fail and crash sql thread.
DBUG_ASSERT(null_ptr == row_data + master_null_byte_count);
Meanwhile, because of binlog_prepare_pending_rows_event() changed with correct
m_cols, some results of specific testcases should be updated:
binlog_multi_engine.test
ndb_binlog_multi.test
rpl_ndb_dd_partitions.test
rpl_ndb_log.test
rpl_truncate_7ndb.test
rpl_truncate_7ndb_2.test
In addition, to ensure rows replication correct between master and slave after the patch,
two 'select * from t1' are added in extra/rpl_tests/rpl_log.test, and some testcases include
rpl_log.test, therefore, the results of these testcases should be updated likewise:
rpl_stm_log.test
rpl_row_log.test
rpl_ndb_log.test
rpl_row_log_innodb.test
Totally, results of nine testcases are updated.
2007-07-12 09:19:29 +02:00
|
|
|
{
|
2007-03-27 12:17:51 +02:00
|
|
|
memcpy(m_cols_ai.bitmap, cols->bitmap, no_bytes_in_map(cols));
|
Bug#19259 rpl_ndb_dd_partitions failed on Solaris
Actually, this testcase will fail generally on all testing platforms.
The bugs come from the inconsistent bitmap between rpl master and slave.
In log_event.cc, the n_bits of m_cols and m_cols_ai are intialized with octal-ceiling
m_width, in fact, their n_bits should be equal to m_width.
Wrong n_bits will cause bitmap_bits_set() get incorrect value in unpack_row()
in rpl_record.cc,
then an assertion in unpack_row() will fail and crash sql thread.
DBUG_ASSERT(null_ptr == row_data + master_null_byte_count);
Meanwhile, because of binlog_prepare_pending_rows_event() changed with correct
m_cols, some results of specific testcases should be updated:
binlog_multi_engine.test
ndb_binlog_multi.test
rpl_ndb_dd_partitions.test
rpl_ndb_log.test
rpl_truncate_7ndb.test
rpl_truncate_7ndb_2.test
In addition, to ensure rows replication correct between master and slave after the patch,
two 'select * from t1' are added in extra/rpl_tests/rpl_log.test, and some testcases include
rpl_log.test, therefore, the results of these testcases should be updated likewise:
rpl_stm_log.test
rpl_row_log.test
rpl_ndb_log.test
rpl_row_log_innodb.test
Totally, results of nine testcases are updated.
2007-07-12 09:19:29 +02:00
|
|
|
create_last_word_mask(&m_cols_ai);
|
|
|
|
}
|
2007-03-27 12:17:51 +02:00
|
|
|
}
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
#endif /* !defined(MYSQL_CLIENT) */
|
|
|
|
|
2007-03-27 12:17:51 +02:00
|
|
|
|
|
|
|
Update_rows_log_event::~Update_rows_log_event()
|
|
|
|
{
|
|
|
|
if (m_cols_ai.bitmap == m_bitbuf_ai) // no my_malloc happened
|
|
|
|
m_cols_ai.bitmap= 0; // so no my_free in bitmap_free
|
|
|
|
bitmap_free(&m_cols_ai); // To pair with bitmap_init().
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
/*
|
|
|
|
Constructor used by slave to read the event from the binary log.
|
|
|
|
*/
|
|
|
|
#ifdef HAVE_REPLICATION
|
|
|
|
Update_rows_log_event::Update_rows_log_event(const char *buf, uint event_len,
|
|
|
|
const
|
|
|
|
Format_description_log_event
|
|
|
|
*description_event)
|
|
|
|
: Rows_log_event(buf, event_len, UPDATE_ROWS_EVENT, description_event)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
|
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
int
|
|
|
|
Update_rows_log_event::do_before_row_operations(const Slave_reporting_capability *const)
|
|
|
|
{
|
|
|
|
if (m_table->s->keys > 0)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
// Allocate buffer for key searches
|
|
|
|
m_key= (uchar*)my_malloc(m_table->key_info->key_length, MYF(MY_WME));
|
|
|
|
if (!m_key)
|
|
|
|
return HA_ERR_OUT_OF_MEM;
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
m_table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET;
|
2005-12-22 06:39:02 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
return 0;
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
int
|
|
|
|
Update_rows_log_event::do_after_row_operations(const Slave_reporting_capability *const,
|
|
|
|
int error)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
|
|
|
/*error= ToDo:find out what this should really be, this triggers close_scan in nbd, returning error?*/
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
m_table->file->ha_index_or_rnd_end();
|
|
|
|
my_free(m_key, MYF(MY_ALLOW_ZERO_PTR)); // Free for multi_malloc
|
2005-12-30 13:32:33 +01:00
|
|
|
m_key= NULL;
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
int
|
2007-08-29 23:28:38 +02:00
|
|
|
Update_rows_log_event::do_exec_row(const Relay_log_info *const rli)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
DBUG_ASSERT(m_table != NULL);
|
2005-12-22 06:39:02 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
int error= find_row(rli);
|
|
|
|
if (error)
|
2007-10-20 18:19:55 +02:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
We need to read the second image in the event of error to be
|
|
|
|
able to skip to the next pair of updates
|
|
|
|
*/
|
|
|
|
m_curr_row= m_curr_row_end;
|
|
|
|
unpack_current_row(rli);
|
2007-06-11 22:15:39 +02:00
|
|
|
return error;
|
2007-10-20 18:19:55 +02:00
|
|
|
}
|
2006-09-21 18:05:02 +02:00
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
/*
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
This is the situation after locating BI:
|
2005-12-22 06:39:02 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
===|=== before image ====|=== after image ===|===
|
|
|
|
^ ^
|
|
|
|
m_curr_row m_curr_row_end
|
2005-12-22 06:39:02 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
BI found in the table is stored in record[0]. We copy it to record[1]
|
|
|
|
and unpack AI to record[0].
|
|
|
|
*/
|
2005-12-22 06:39:02 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
store_record(m_table,record[1]);
|
2005-12-22 06:39:02 +01:00
|
|
|
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
m_curr_row= m_curr_row_end;
|
|
|
|
error= unpack_current_row(rli); // this also updates m_curr_row_end
|
2006-02-24 15:38:20 +01:00
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
/*
|
2006-05-08 20:05:25 +02:00
|
|
|
Now we have the right row to update. The old row (the one we're
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
looking for) is in record[1] and the new row is in record[0].
|
2005-12-22 06:39:02 +01:00
|
|
|
*/
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
#ifndef HAVE_purify
|
|
|
|
/*
|
|
|
|
Don't print debug messages when running valgrind since they can
|
|
|
|
trigger false warnings.
|
|
|
|
*/
|
|
|
|
DBUG_PRINT("info",("Updating row in table"));
|
|
|
|
DBUG_DUMP("old record", m_table->record[1], m_table->s->reclength);
|
|
|
|
DBUG_DUMP("new values", m_table->record[0], m_table->s->reclength);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
error= m_table->file->ha_update_row(m_table->record[1], m_table->record[0]);
|
2007-06-28 15:07:55 +02:00
|
|
|
if (error == HA_ERR_RECORD_IS_THE_SAME)
|
|
|
|
error= 0;
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
return error;
|
|
|
|
}
|
BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
2007-08-26 14:31:10 +02:00
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
#endif /* !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) */
|
|
|
|
|
|
|
|
#ifdef MYSQL_CLIENT
|
|
|
|
void Update_rows_log_event::print(FILE *file,
|
|
|
|
PRINT_EVENT_INFO* print_event_info)
|
|
|
|
{
|
2006-10-06 10:17:02 +02:00
|
|
|
Rows_log_event::print_helper(file, print_event_info, "Update_rows");
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2007-03-29 20:31:09 +02:00
|
|
|
|
|
|
|
Incident_log_event::Incident_log_event(const char *buf, uint event_len,
|
|
|
|
const Format_description_log_event *descr_event)
|
|
|
|
: Log_event(buf, descr_event)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("Incident_log_event::Incident_log_event");
|
|
|
|
uint8 const common_header_len=
|
|
|
|
descr_event->common_header_len;
|
|
|
|
uint8 const post_header_len=
|
|
|
|
descr_event->post_header_len[INCIDENT_EVENT-1];
|
|
|
|
|
|
|
|
DBUG_PRINT("info",("event_len: %u; common_header_len: %d; post_header_len: %d",
|
|
|
|
event_len, common_header_len, post_header_len));
|
|
|
|
|
2008-12-29 17:04:10 +01:00
|
|
|
int incident_number= uint2korr(buf + common_header_len);
|
|
|
|
if (incident_number >= INCIDENT_COUNT ||
|
|
|
|
incident_number <= INCIDENT_NONE)
|
|
|
|
{
|
|
|
|
// If the incident is not recognized, this binlog event is
|
|
|
|
// invalid. If we set incident_number to INCIDENT_NONE, the
|
|
|
|
// invalidity will be detected by is_valid().
|
|
|
|
incident_number= INCIDENT_NONE;
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
m_incident= static_cast<Incident>(incident_number);
|
2007-03-29 20:31:09 +02:00
|
|
|
char const *ptr= buf + common_header_len + post_header_len;
|
|
|
|
char const *const str_end= buf + event_len;
|
2007-03-30 10:27:08 +02:00
|
|
|
uint8 len= 0; // Assignment to keep compiler happy
|
|
|
|
const char *str= NULL; // Assignment to keep compiler happy
|
2007-03-29 20:31:09 +02:00
|
|
|
read_str(&ptr, str_end, &str, &len);
|
|
|
|
m_message.str= const_cast<char*>(str);
|
|
|
|
m_message.length= len;
|
|
|
|
DBUG_PRINT("info", ("m_incident: %d", m_incident));
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Incident_log_event::~Incident_log_event()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
const char *
|
|
|
|
Incident_log_event::description() const
|
|
|
|
{
|
|
|
|
static const char *const description[]= {
|
|
|
|
"NOTHING", // Not used
|
|
|
|
"LOST_EVENTS"
|
|
|
|
};
|
|
|
|
|
|
|
|
DBUG_PRINT("info", ("m_incident: %d", m_incident));
|
|
|
|
|
|
|
|
return description[m_incident];
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef MYSQL_CLIENT
|
|
|
|
void Incident_log_event::pack_info(Protocol *protocol)
|
|
|
|
{
|
|
|
|
char buf[256];
|
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
|
|
|
size_t bytes;
|
2007-03-29 20:31:09 +02:00
|
|
|
if (m_message.length > 0)
|
|
|
|
bytes= my_snprintf(buf, sizeof(buf), "#%d (%s)",
|
|
|
|
m_incident, description());
|
|
|
|
else
|
|
|
|
bytes= my_snprintf(buf, sizeof(buf), "#%d (%s): %s",
|
|
|
|
m_incident, description(), m_message.str);
|
|
|
|
protocol->store(buf, bytes, &my_charset_bin);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef MYSQL_CLIENT
|
|
|
|
void
|
|
|
|
Incident_log_event::print(FILE *file,
|
|
|
|
PRINT_EVENT_INFO *print_event_info)
|
|
|
|
{
|
|
|
|
if (print_event_info->short_form)
|
|
|
|
return;
|
|
|
|
|
|
|
|
Write_on_release_cache cache(&print_event_info->head_cache, file);
|
|
|
|
print_header(&cache, print_event_info, FALSE);
|
|
|
|
my_b_printf(&cache, "\n# Incident: %s", description());
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
|
|
|
|
int
|
2007-08-16 07:37:50 +02:00
|
|
|
Incident_log_event::do_apply_event(Relay_log_info const *rli)
|
2007-03-29 20:31:09 +02:00
|
|
|
{
|
2007-03-30 15:29:30 +02:00
|
|
|
DBUG_ENTER("Incident_log_event::do_apply_event");
|
2007-06-11 22:15:39 +02:00
|
|
|
rli->report(ERROR_LEVEL, ER_SLAVE_INCIDENT,
|
|
|
|
ER(ER_SLAVE_INCIDENT),
|
|
|
|
description(),
|
|
|
|
m_message.length > 0 ? m_message.str : "<none>");
|
2007-03-29 20:31:09 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
bool
|
|
|
|
Incident_log_event::write_data_header(IO_CACHE *file)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("Incident_log_event::write_data_header");
|
|
|
|
DBUG_PRINT("enter", ("m_incident: %d", m_incident));
|
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 buf[sizeof(int16)];
|
2007-03-29 20:31:09 +02:00
|
|
|
int2store(buf, (int16) m_incident);
|
|
|
|
DBUG_RETURN(my_b_safe_write(file, buf, sizeof(buf)));
|
|
|
|
}
|
|
|
|
|
|
|
|
bool
|
|
|
|
Incident_log_event::write_data_body(IO_CACHE *file)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("Incident_log_event::write_data_body");
|
2009-02-13 17:41:47 +01:00
|
|
|
DBUG_RETURN(write_str(file, m_message.str, (uint) m_message.length));
|
2007-03-29 20:31:09 +02:00
|
|
|
}
|
2008-03-07 13:59:36 +01:00
|
|
|
|
|
|
|
|
|
|
|
#ifdef MYSQL_CLIENT
|
|
|
|
/**
|
|
|
|
The default values for these variables should be values that are
|
|
|
|
*incorrect*, i.e., values that cannot occur in an event. This way,
|
|
|
|
they will always be printed for the first event.
|
|
|
|
*/
|
|
|
|
st_print_event_info::st_print_event_info()
|
|
|
|
:flags2_inited(0), sql_mode_inited(0),
|
|
|
|
auto_increment_increment(0),auto_increment_offset(0), charset_inited(0),
|
|
|
|
lc_time_names_number(~0),
|
|
|
|
charset_database_number(ILLEGAL_CHARSET_INFO_NUMBER),
|
|
|
|
thread_id(0), thread_id_printed(false),
|
|
|
|
base64_output_mode(BASE64_OUTPUT_UNSPEC), printed_fd_event(FALSE)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Currently we only use static PRINT_EVENT_INFO objects, so zeroed at
|
|
|
|
program's startup, but these explicit bzero() is for the day someone
|
|
|
|
creates dynamic instances.
|
|
|
|
*/
|
|
|
|
bzero(db, sizeof(db));
|
|
|
|
bzero(charset, sizeof(charset));
|
|
|
|
bzero(time_zone_str, sizeof(time_zone_str));
|
|
|
|
delimiter[0]= ';';
|
|
|
|
delimiter[1]= 0;
|
|
|
|
myf const flags = MYF(MY_WME | MY_NABP);
|
|
|
|
open_cached_file(&head_cache, NULL, NULL, 0, flags);
|
|
|
|
open_cached_file(&body_cache, NULL, NULL, 0, flags);
|
|
|
|
}
|
|
|
|
#endif
|