Commit 7619a5ef authored by unknown's avatar unknown

Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl

into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/rpl_record.cc:
  Manual merge.
parents e8e20954 bc2ecae3
...@@ -466,7 +466,7 @@ binary data'; ...@@ -466,7 +466,7 @@ binary data';
select * from t2 order by f1; select * from t2 order by f1;
select * from t3 order by f1; select * from t3 order by f1;
select * from t4 order by f1; select * from t4 order by f1;
select * from t31 order by f1; select * from t31 order by f3;
connection master; connection master;
......
No preview for this file type
No preview for this file type
No preview for this file type
...@@ -13,4 +13,3 @@ ...@@ -13,4 +13,3 @@
rpl_ddl : BUG#26418 2007-03-01 mleich Slave out of sync after CREATE/DROP TEMPORARY TABLE + ROLLBACK on master rpl_ddl : BUG#26418 2007-03-01 mleich Slave out of sync after CREATE/DROP TEMPORARY TABLE + ROLLBACK on master
rpl_auto_increment_11932 : Bug#29809 2007-07-16 ingo Slave SQL errors in warnings file rpl_auto_increment_11932 : Bug#29809 2007-07-16 ingo Slave SQL errors in warnings file
rpl_stm_extraColmaster_ndb : WL#3915 : Statement-based replication not supported in ndb. Enable test when supported. rpl_stm_extraColmaster_ndb : WL#3915 : Statement-based replication not supported in ndb. Enable test when supported.
rpl_row_extraColmaster_ndb : BUG#29549 : Replication of BLOBs fail for NDB
...@@ -344,5 +344,6 @@ FLUSH LOGS; ...@@ -344,5 +344,6 @@ FLUSH LOGS;
--exec rm $MYSQLTEST_VARDIR/tmp/local.sql --exec rm $MYSQLTEST_VARDIR/tmp/local.sql
DROP TABLE IF EXISTS t1, t2, t3, t04, t05, t4, t5; DROP TABLE IF EXISTS t1, t2, t3, t04, t05, t4, t5;
sync_slave_with_master;
# End of 4.1 tests # End of 4.1 tests
...@@ -15,8 +15,6 @@ rpl_ndb_2innodb : BUG#19227 2006-04-20 pekka pk delete apparently not r ...@@ -15,8 +15,6 @@ rpl_ndb_2innodb : BUG#19227 2006-04-20 pekka pk delete apparently not r
rpl_ndb_2myisam : BUG#19227 Seems to pass currently rpl_ndb_2myisam : BUG#19227 Seems to pass currently
rpl_ndb_2other : BUG#21842 2007-08-30 tsmith test has never worked on bigendian (sol10-sparc-a, powermacg5 rpl_ndb_2other : BUG#21842 2007-08-30 tsmith test has never worked on bigendian (sol10-sparc-a, powermacg5
rpl_ndb_dd_partitions : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD rpl_ndb_dd_partitions : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD
rpl_ndb_innodb2ndb : Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue
rpl_ndb_myisam2ndb : Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue
rpl_ndb_ddl : BUG#28798 2007-05-31 lars Valgrind failure in NDB rpl_ndb_ddl : BUG#28798 2007-05-31 lars Valgrind failure in NDB
rpl_ndb_mix_innodb : BUG#28123 rpl_ndb_mix_innodb.test casue slave to core on sol10-sparc-a rpl_ndb_mix_innodb : BUG#28123 rpl_ndb_mix_innodb.test casue slave to core on sol10-sparc-a
rpl_ndb_ctype_ucs2_def : BUG#27404 util thd mysql_parse sig11 when mysqld default multibyte charset rpl_ndb_ctype_ucs2_def : BUG#27404 util thd mysql_parse sig11 when mysqld default multibyte charset
......
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
# Simple test for the partition storage engine # Simple test for the partition storage engine
# Taken fromm the select test # Taken fromm the select test
# #
-- source include/have_partition.inc source include/have_partition.inc;
source include/have_archive.inc;
--disable_warnings --disable_warnings
drop table if exists t1; drop table if exists t1;
......
This diff is collapsed.
This diff is collapsed.
...@@ -3577,9 +3577,6 @@ bool MYSQL_BIN_LOG::write(Log_event *event_info) ...@@ -3577,9 +3577,6 @@ bool MYSQL_BIN_LOG::write(Log_event *event_info)
(!binlog_filter->db_ok(local_db))) (!binlog_filter->db_ok(local_db)))
{ {
VOID(pthread_mutex_unlock(&LOCK_log)); VOID(pthread_mutex_unlock(&LOCK_log));
DBUG_PRINT("info",("OPTION_BIN_LOG is %s, db_ok('%s') == %d",
(thd->options & OPTION_BIN_LOG) ? "set" : "clear",
local_db, binlog_filter->db_ok(local_db)));
DBUG_RETURN(0); DBUG_RETURN(0);
} }
#endif /* HAVE_REPLICATION */ #endif /* HAVE_REPLICATION */
......
...@@ -65,6 +65,8 @@ pack_row(TABLE *table, MY_BITMAP const* cols, ...@@ -65,6 +65,8 @@ pack_row(TABLE *table, MY_BITMAP const* cols,
my_ptrdiff_t const rec_offset= record - table->record[0]; my_ptrdiff_t const rec_offset= record - table->record[0];
my_ptrdiff_t const def_offset= table->s->default_values - table->record[0]; my_ptrdiff_t const def_offset= table->s->default_values - table->record[0];
DBUG_ENTER("pack_row");
/* /*
We write the null bits and the packed records using one pass We write the null bits and the packed records using one pass
through all the fields. The null bytes are written little-endian, through all the fields. The null bytes are written little-endian,
...@@ -96,26 +98,14 @@ pack_row(TABLE *table, MY_BITMAP const* cols, ...@@ -96,26 +98,14 @@ pack_row(TABLE *table, MY_BITMAP const* cols,
For big-endian machines, we have to make sure that the For big-endian machines, we have to make sure that the
length is stored in little-endian format, since this is the length is stored in little-endian format, since this is the
format used for the binlog. format used for the binlog.
We do this by setting the db_low_byte_first, which is used
inside some store_length() to decide what order to write the
bytes in.
In reality, db_log_byte_first is only set for legacy table
type Isam, but in the event of a bug, we need to guarantee
the endianess when writing to the binlog.
This is currently broken for NDB due to BUG#29549, so we
will fix it when NDB has fixed their way of handling BLOBs.
*/ */
#if 0 const uchar *old_pack_ptr= pack_ptr;
bool save= table->s->db_low_byte_first; pack_ptr= field->pack(pack_ptr, field->ptr + offset,
table->s->db_low_byte_first= TRUE; field->max_data_length(), TRUE);
#endif DBUG_PRINT("debug", ("field: %s; pack_ptr: 0x%lx;"
pack_ptr= field->pack(pack_ptr, field->ptr + offset); " pack_ptr':0x%lx; bytes: %d",
#if 0 field->field_name, (ulong) old_pack_ptr,
table->s->db_low_byte_first= save; (ulong) pack_ptr, pack_ptr - old_pack_ptr));
#endif
} }
null_mask <<= 1; null_mask <<= 1;
...@@ -143,8 +133,8 @@ pack_row(TABLE *table, MY_BITMAP const* cols, ...@@ -143,8 +133,8 @@ pack_row(TABLE *table, MY_BITMAP const* cols,
packed data. If it doesn't, something is very wrong. packed data. If it doesn't, something is very wrong.
*/ */
DBUG_ASSERT(null_ptr == row_data + null_byte_count); DBUG_ASSERT(null_ptr == row_data + null_byte_count);
DBUG_DUMP("row_data", row_data, pack_ptr - row_data);
return static_cast<size_t>(pack_ptr - row_data); DBUG_RETURN(static_cast<size_t>(pack_ptr - row_data));
} }
#endif #endif
...@@ -242,18 +232,14 @@ unpack_row(Relay_log_info const *rli, ...@@ -242,18 +232,14 @@ unpack_row(Relay_log_info const *rli,
Use the master's size information if available else call Use the master's size information if available else call
normal unpack operation. normal unpack operation.
*/ */
#if 0
bool save= table->s->db_low_byte_first;
table->s->db_low_byte_first= TRUE;
#endif
uint16 const metadata= tabledef->field_metadata(i); uint16 const metadata= tabledef->field_metadata(i);
if (tabledef && metadata) uchar const *const old_pack_ptr= pack_ptr;
pack_ptr= f->unpack(f->ptr, pack_ptr, metadata); pack_ptr= f->unpack(f->ptr, pack_ptr, metadata, TRUE);
else DBUG_PRINT("debug", ("field: %s; metadata: 0x%x;"
pack_ptr= f->unpack(f->ptr, pack_ptr); " pack_ptr: 0x%lx; pack_ptr': 0x%lx; bytes: %d",
#if 0 f->field_name, metadata,
table->s->db_low_byte_first= save; (ulong) old_pack_ptr, (ulong) pack_ptr,
#endif pack_ptr - old_pack_ptr));
} }
null_mask <<= 1; null_mask <<= 1;
...@@ -289,6 +275,8 @@ unpack_row(Relay_log_info const *rli, ...@@ -289,6 +275,8 @@ unpack_row(Relay_log_info const *rli,
*/ */
DBUG_ASSERT(null_ptr == row_data + master_null_byte_count); DBUG_ASSERT(null_ptr == row_data + master_null_byte_count);
DBUG_DUMP("row_data", row_data, pack_ptr - row_data);
*row_end = pack_ptr; *row_end = pack_ptr;
if (master_reclength) if (master_reclength)
{ {
......
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
#include "event_data_objects.h" #include "event_data_objects.h"
#include <my_dir.h> #include <my_dir.h>
#define STR_OR_NIL(S) ((S) ? (S) : "<nil>")
#ifdef WITH_PARTITION_STORAGE_ENGINE #ifdef WITH_PARTITION_STORAGE_ENGINE
#include "ha_partition.h" #include "ha_partition.h"
#endif #endif
...@@ -3115,8 +3117,8 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond) ...@@ -3115,8 +3117,8 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond)
schema_table_idx= get_schema_table_idx(schema_table); schema_table_idx= get_schema_table_idx(schema_table);
get_lookup_field_values(thd, cond, tables, &lookup_field_vals); get_lookup_field_values(thd, cond, tables, &lookup_field_vals);
DBUG_PRINT("INDEX VALUES",("db_name='%s', table_name='%s'", DBUG_PRINT("INDEX VALUES",("db_name='%s', table_name='%s'",
lookup_field_vals.db_value.str, STR_OR_NIL(lookup_field_vals.db_value.str),
lookup_field_vals.table_value.str)); STR_OR_NIL(lookup_field_vals.table_value.str)));
if (!lookup_field_vals.wild_db_value && !lookup_field_vals.wild_table_value) if (!lookup_field_vals.wild_db_value && !lookup_field_vals.wild_table_value)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment