mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
70823e1d91
The reason for the failure was a bug in an include file on debian that causes 'struct stat' to have different sized depending on the environment. This patch fixes so that we always include my_global.h or my_config.h before we include any other files. Other things: - Removed #include <my_global.h> in some include files; Better to always do this at the top level to have as few "always-include-this-file-first' files as possible. - Removed usage of some include files that where already included by my_global.h or by other files. client/mysql_plugin.c: Use my_global.h first client/mysqlslap.c: Remove duplicated include files extra/comp_err.c: Remove duplicated include files include/m_string.h: Remove duplicated include files include/maria.h: Remove duplicated include files libmysqld/emb_qcache.cc: Use my_global.h first plugin/semisync/semisync.h: Use my_pthread.h first sql/datadict.cc: Use my_global.h first sql/debug_sync.cc: Use my_global.h first sql/derror.cc: Use my_global.h first sql/des_key_file.cc: Use my_global.h first sql/discover.cc: Use my_global.h first sql/event_data_objects.cc: Use my_global.h first sql/event_db_repository.cc: Use my_global.h first sql/event_parse_data.cc: Use my_global.h first sql/event_queue.cc: Use my_global.h first sql/event_scheduler.cc: Use my_global.h first sql/events.cc: Use my_global.h first sql/field.cc: Use my_global.h first Remove duplicated include files sql/field_conv.cc: Use my_global.h first sql/filesort.cc: Use my_global.h first Remove duplicated include files sql/gstream.cc: Use my_global.h first sql/ha_ndbcluster.cc: Use my_global.h first sql/ha_ndbcluster_binlog.cc: Use my_global.h first sql/ha_ndbcluster_cond.cc: Use my_global.h first sql/ha_partition.cc: Use my_global.h first sql/handler.cc: Use my_global.h first sql/hash_filo.cc: Use my_global.h first sql/hostname.cc: Use my_global.h first sql/init.cc: Use my_global.h first sql/item.cc: Use my_global.h first sql/item_buff.cc: Use my_global.h first sql/item_cmpfunc.cc: Use my_global.h first sql/item_create.cc: Use my_global.h first sql/item_geofunc.cc: Use my_global.h first sql/item_inetfunc.cc: Use my_global.h first sql/item_row.cc: Use my_global.h first sql/item_strfunc.cc: Use my_global.h first sql/item_subselect.cc: Use my_global.h first sql/item_sum.cc: Use my_global.h first sql/item_timefunc.cc: Use my_global.h first sql/item_xmlfunc.cc: Use my_global.h first sql/key.cc: Use my_global.h first sql/lock.cc: Use my_global.h first sql/log.cc: Use my_global.h first sql/log_event.cc: Use my_global.h first sql/log_event_old.cc: Use my_global.h first sql/mf_iocache.cc: Use my_global.h first sql/mysql_install_db.cc: Remove duplicated include files sql/mysqld.cc: Remove duplicated include files sql/net_serv.cc: Remove duplicated include files sql/opt_range.cc: Use my_global.h first sql/opt_subselect.cc: Use my_global.h first sql/opt_sum.cc: Use my_global.h first sql/parse_file.cc: Use my_global.h first sql/partition_info.cc: Use my_global.h first sql/procedure.cc: Use my_global.h first sql/protocol.cc: Use my_global.h first sql/records.cc: Use my_global.h first sql/records.h: Don't include my_global.h Better to do this at the upper level sql/repl_failsafe.cc: Use my_global.h first sql/rpl_filter.cc: Use my_global.h first sql/rpl_gtid.cc: Use my_global.h first sql/rpl_handler.cc: Use my_global.h first sql/rpl_injector.cc: Use my_global.h first sql/rpl_record.cc: Use my_global.h first sql/rpl_record_old.cc: Use my_global.h first sql/rpl_reporting.cc: Use my_global.h first sql/rpl_rli.cc: Use my_global.h first sql/rpl_tblmap.cc: Use my_global.h first sql/rpl_utility.cc: Use my_global.h first sql/set_var.cc: Added comment sql/slave.cc: Use my_global.h first sql/sp.cc: Use my_global.h first sql/sp_cache.cc: Use my_global.h first sql/sp_head.cc: Use my_global.h first sql/sp_pcontext.cc: Use my_global.h first sql/sp_rcontext.cc: Use my_global.h first sql/spatial.cc: Use my_global.h first sql/sql_acl.cc: Use my_global.h first sql/sql_admin.cc: Use my_global.h first sql/sql_analyse.cc: Use my_global.h first sql/sql_audit.cc: Use my_global.h first sql/sql_base.cc: Use my_global.h first sql/sql_binlog.cc: Use my_global.h first sql/sql_bootstrap.cc: Use my_global.h first Use my_global.h first sql/sql_cache.cc: Use my_global.h first sql/sql_class.cc: Use my_global.h first sql/sql_client.cc: Use my_global.h first sql/sql_connect.cc: Use my_global.h first sql/sql_crypt.cc: Use my_global.h first sql/sql_cursor.cc: Use my_global.h first sql/sql_db.cc: Use my_global.h first sql/sql_delete.cc: Use my_global.h first sql/sql_derived.cc: Use my_global.h first sql/sql_do.cc: Use my_global.h first sql/sql_error.cc: Use my_global.h first sql/sql_explain.cc: Use my_global.h first sql/sql_expression_cache.cc: Use my_global.h first sql/sql_handler.cc: Use my_global.h first sql/sql_help.cc: Use my_global.h first sql/sql_insert.cc: Use my_global.h first sql/sql_lex.cc: Use my_global.h first sql/sql_load.cc: Use my_global.h first sql/sql_locale.cc: Use my_global.h first sql/sql_manager.cc: Use my_global.h first sql/sql_parse.cc: Use my_global.h first sql/sql_partition.cc: Use my_global.h first sql/sql_plugin.cc: Added comment sql/sql_prepare.cc: Use my_global.h first sql/sql_priv.h: Added error if we use this before including my_global.h This check is here becasue so many files includes sql_priv.h first. sql/sql_profile.cc: Use my_global.h first sql/sql_reload.cc: Use my_global.h first sql/sql_rename.cc: Use my_global.h first sql/sql_repl.cc: Use my_global.h first sql/sql_select.cc: Use my_global.h first sql/sql_servers.cc: Use my_global.h first sql/sql_show.cc: Added comment sql/sql_signal.cc: Use my_global.h first sql/sql_statistics.cc: Use my_global.h first sql/sql_table.cc: Use my_global.h first sql/sql_tablespace.cc: Use my_global.h first sql/sql_test.cc: Use my_global.h first sql/sql_time.cc: Use my_global.h first sql/sql_trigger.cc: Use my_global.h first sql/sql_udf.cc: Use my_global.h first sql/sql_union.cc: Use my_global.h first sql/sql_update.cc: Use my_global.h first sql/sql_view.cc: Use my_global.h first sql/sys_vars.cc: Added comment sql/table.cc: Use my_global.h first sql/thr_malloc.cc: Use my_global.h first sql/transaction.cc: Use my_global.h first sql/uniques.cc: Use my_global.h first sql/unireg.cc: Use my_global.h first sql/unireg.h: Removed inclusion of my_global.h storage/archive/ha_archive.cc: Added comment storage/blackhole/ha_blackhole.cc: Use my_global.h first storage/csv/ha_tina.cc: Use my_global.h first storage/csv/transparent_file.cc: Use my_global.h first storage/federated/ha_federated.cc: Use my_global.h first storage/federatedx/federatedx_io.cc: Use my_global.h first storage/federatedx/federatedx_io_mysql.cc: Use my_global.h first storage/federatedx/federatedx_io_null.cc: Use my_global.h first storage/federatedx/federatedx_txn.cc: Use my_global.h first storage/heap/ha_heap.cc: Use my_global.h first storage/innobase/handler/handler0alter.cc: Use my_global.h first storage/maria/ha_maria.cc: Use my_global.h first storage/maria/unittest/ma_maria_log_cleanup.c: Remove duplicated include files storage/maria/unittest/test_file.c: Added comment storage/myisam/ha_myisam.cc: Move sql_plugin.h first as this includes my_global.h storage/myisammrg/ha_myisammrg.cc: Use my_global.h first storage/oqgraph/oqgraph_thunk.cc: Use my_config.h and my_global.h first One could not include my_global.h before oqgraph_thunk.h (don't know why) storage/spider/ha_spider.cc: Use my_global.h first storage/spider/hs_client/config.cpp: Use my_global.h first storage/spider/hs_client/escape.cpp: Use my_global.h first storage/spider/hs_client/fatal.cpp: Use my_global.h first storage/spider/hs_client/hstcpcli.cpp: Use my_global.h first storage/spider/hs_client/socket.cpp: Use my_global.h first storage/spider/hs_client/string_util.cpp: Use my_global.h first storage/spider/spd_conn.cc: Use my_global.h first storage/spider/spd_copy_tables.cc: Use my_global.h first storage/spider/spd_db_conn.cc: Use my_global.h first storage/spider/spd_db_handlersocket.cc: Use my_global.h first storage/spider/spd_db_mysql.cc: Use my_global.h first storage/spider/spd_db_oracle.cc: Use my_global.h first storage/spider/spd_direct_sql.cc: Use my_global.h first storage/spider/spd_i_s.cc: Use my_global.h first storage/spider/spd_malloc.cc: Use my_global.h first storage/spider/spd_param.cc: Use my_global.h first storage/spider/spd_ping_table.cc: Use my_global.h first storage/spider/spd_sys_table.cc: Use my_global.h first storage/spider/spd_table.cc: Use my_global.h first storage/spider/spd_trx.cc: Use my_global.h first storage/xtradb/handler/handler0alter.cc: Use my_global.h first storage/xtradb/handler/i_s.cc: Use my_global.h first
200 lines
6.6 KiB
C++
200 lines
6.6 KiB
C++
/* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
|
|
|
#include <my_global.h>
|
|
#include "sql_priv.h"
|
|
#include "unireg.h" // REQUIRED by other includes
|
|
#include "rpl_rli.h"
|
|
#include "rpl_record_old.h"
|
|
#include "log_event.h" // Log_event_type
|
|
|
|
size_t
|
|
pack_row_old(TABLE *table, MY_BITMAP const* cols,
|
|
uchar *row_data, const uchar *record)
|
|
{
|
|
Field **p_field= table->field, *field;
|
|
int n_null_bytes= table->s->null_bytes;
|
|
uchar *ptr;
|
|
uint i;
|
|
my_ptrdiff_t const rec_offset= record - table->record[0];
|
|
my_ptrdiff_t const def_offset= table->s->default_values - table->record[0];
|
|
memcpy(row_data, record, n_null_bytes);
|
|
ptr= row_data+n_null_bytes;
|
|
|
|
for (i= 0 ; (field= *p_field) ; i++, p_field++)
|
|
{
|
|
if (bitmap_is_set(cols,i))
|
|
{
|
|
my_ptrdiff_t const offset=
|
|
field->is_null(rec_offset) ? def_offset : rec_offset;
|
|
field->move_field_offset(offset);
|
|
ptr= field->pack(ptr, field->ptr);
|
|
field->move_field_offset(-offset);
|
|
}
|
|
}
|
|
return (static_cast<size_t>(ptr - row_data));
|
|
}
|
|
|
|
|
|
/*
|
|
Unpack a row into a record.
|
|
|
|
SYNOPSIS
|
|
unpack_row()
|
|
rli Relay log info
|
|
table Table to unpack into
|
|
colcnt Number of columns to read from record
|
|
record Record where the data should be unpacked
|
|
row Packed row data
|
|
cols Pointer to columns data to fill in
|
|
row_end Pointer to variable that will hold the value of the
|
|
one-after-end position for the row
|
|
master_reclength
|
|
Pointer to variable that will be set to the length of the
|
|
record on the master side
|
|
rw_set Pointer to bitmap that holds either the read_set or the
|
|
write_set of the table
|
|
|
|
DESCRIPTION
|
|
|
|
The row is assumed to only consist of the fields for which the
|
|
bitset represented by 'arr' and 'bits'; the other parts of the
|
|
record are left alone.
|
|
|
|
At most 'colcnt' columns are read: if the table is larger than
|
|
that, the remaining fields are not filled in.
|
|
|
|
RETURN VALUE
|
|
|
|
Error code, or zero if no error. The following error codes can
|
|
be returned:
|
|
|
|
ER_NO_DEFAULT_FOR_FIELD
|
|
Returned if one of the fields existing on the slave but not on
|
|
the master does not have a default value (and isn't nullable)
|
|
ER_SLAVE_CORRUPT_EVENT
|
|
Wrong data for field found.
|
|
*/
|
|
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
|
|
int
|
|
unpack_row_old(rpl_group_info *rgi,
|
|
TABLE *table, uint const colcnt, uchar *record,
|
|
uchar const *row, const uchar *row_buffer_end,
|
|
MY_BITMAP const *cols,
|
|
uchar const **row_end, ulong *master_reclength,
|
|
MY_BITMAP* const rw_set, Log_event_type const event_type)
|
|
{
|
|
DBUG_ASSERT(record && row);
|
|
my_ptrdiff_t const offset= record - (uchar*) table->record[0];
|
|
size_t master_null_bytes= table->s->null_bytes;
|
|
|
|
if (colcnt != table->s->fields)
|
|
{
|
|
Field **fptr= &table->field[colcnt-1];
|
|
do
|
|
master_null_bytes= (*fptr)->last_null_byte();
|
|
while (master_null_bytes == Field::LAST_NULL_BYTE_UNDEF &&
|
|
fptr-- > table->field);
|
|
|
|
/*
|
|
If master_null_bytes is LAST_NULL_BYTE_UNDEF (0) at this time,
|
|
there were no nullable fields nor BIT fields at all in the
|
|
columns that are common to the master and the slave. In that
|
|
case, there is only one null byte holding the X bit.
|
|
|
|
OBSERVE! There might still be nullable columns following the
|
|
common columns, so table->s->null_bytes might be greater than 1.
|
|
*/
|
|
if (master_null_bytes == Field::LAST_NULL_BYTE_UNDEF)
|
|
master_null_bytes= 1;
|
|
}
|
|
|
|
DBUG_ASSERT(master_null_bytes <= table->s->null_bytes);
|
|
memcpy(record, row, master_null_bytes); // [1]
|
|
int error= 0;
|
|
|
|
bitmap_set_all(rw_set);
|
|
|
|
Field **const begin_ptr = table->field;
|
|
Field **field_ptr;
|
|
uchar const *ptr= row + master_null_bytes;
|
|
Field **const end_ptr= begin_ptr + colcnt;
|
|
for (field_ptr= begin_ptr ; field_ptr < end_ptr ; ++field_ptr)
|
|
{
|
|
Field *const f= *field_ptr;
|
|
|
|
if (bitmap_is_set(cols, field_ptr - begin_ptr))
|
|
{
|
|
f->move_field_offset(offset);
|
|
ptr= f->unpack(f->ptr, ptr, row_buffer_end, 0);
|
|
f->move_field_offset(-offset);
|
|
if (!ptr)
|
|
{
|
|
rgi->rli->report(ERROR_LEVEL, ER_SLAVE_CORRUPT_EVENT, NULL,
|
|
"Could not read field `%s` of table `%s`.`%s`",
|
|
f->field_name, table->s->db.str,
|
|
table->s->table_name.str);
|
|
return(ER_SLAVE_CORRUPT_EVENT);
|
|
}
|
|
}
|
|
else
|
|
bitmap_clear_bit(rw_set, field_ptr - begin_ptr);
|
|
}
|
|
|
|
*row_end = ptr;
|
|
if (master_reclength)
|
|
{
|
|
if (*field_ptr)
|
|
*master_reclength = (*field_ptr)->ptr - table->record[0];
|
|
else
|
|
*master_reclength = table->s->reclength;
|
|
}
|
|
|
|
/*
|
|
Set properties for remaining columns, if there are any. We let the
|
|
corresponding bit in the write_set be set, to write the value if
|
|
it was not there already. We iterate over all remaining columns,
|
|
even if there were an error, to get as many error messages as
|
|
possible. We are still able to return a pointer to the next row,
|
|
so redo that.
|
|
|
|
This generation of error messages is only relevant when inserting
|
|
new rows.
|
|
*/
|
|
for ( ; *field_ptr ; ++field_ptr)
|
|
{
|
|
uint32 const mask= NOT_NULL_FLAG | NO_DEFAULT_VALUE_FLAG;
|
|
|
|
DBUG_PRINT("debug", ("flags = 0x%x, mask = 0x%x, flags & mask = 0x%x",
|
|
(*field_ptr)->flags, mask,
|
|
(*field_ptr)->flags & mask));
|
|
|
|
if (event_type == WRITE_ROWS_EVENT &&
|
|
((*field_ptr)->flags & mask) == mask)
|
|
{
|
|
rgi->rli->report(ERROR_LEVEL, ER_NO_DEFAULT_FOR_FIELD, NULL,
|
|
"Field `%s` of table `%s`.`%s` "
|
|
"has no default value and cannot be NULL",
|
|
(*field_ptr)->field_name, table->s->db.str,
|
|
table->s->table_name.str);
|
|
error = ER_NO_DEFAULT_FOR_FIELD;
|
|
}
|
|
else
|
|
(*field_ptr)->set_default();
|
|
}
|
|
|
|
return error;
|
|
}
|
|
#endif
|