Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.1892 05/08/17 10:27:49 tomas@stripped +5 -0
merge error
sql/slave.cc
1.254 05/08/17 10:27:43 tomas@stripped +1 -1
merge error
sql/log_event.h
1.119 05/08/17 10:27:43 tomas@stripped +2 -2
merge
sql/log_event.cc
1.187 05/08/17 10:27:43 tomas@stripped +4 -4
merge
sql/handler.cc
1.185 05/08/17 10:27:43 tomas@stripped +3 -3
merge
sql/Makefile.am
1.114 05/08/17 10:27:43 tomas@stripped +2 -2
merge error
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: tomas
# Host: poseidon.ndb.mysql.com
# Root: /home/tomas/mysql-5.1
--- 1.113/sql/Makefile.am 2005-08-16 16:54:05 +02:00
+++ 1.114/sql/Makefile.am 2005-08-17 10:27:43 +02:00
@@ -56,7 +56,7 @@
ha_ndbcluster.h opt_range.h protocol.h \
sql_select.h structs.h table.h sql_udf.h hash_filo.h\
lex.h lex_symbol.h sql_acl.h sql_crypt.h \
- log_event.h sql_repl.h slave.h rpl_filter.h \
+ log_event.h sql_repl.h slave.h \
stacktrace.h sql_sort.h sql_cache.h set_var.h \
spatial.h gstream.h client_settings.h tzfile.h \
tztime.h my_decimal.h\
@@ -91,7 +91,7 @@
sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \
sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \
sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \
- slave.cc sql_repl.cc rpl_filter.cc \
+ slave.cc sql_repl.cc \
sql_union.cc sql_derived.cc \
client.c sql_client.cc mini_client_errors.c pack.c\
stacktrace.c repl_failsafe.h repl_failsafe.cc \
--- 1.184/sql/handler.cc 2005-08-16 16:54:07 +02:00
+++ 1.185/sql/handler.cc 2005-08-17 10:27:43 +02:00
@@ -2665,8 +2665,8 @@
return
binlog_row_based &&
table->s->tmp_table == NO_TMP_TABLE &&
- db_ok(table->s->db, binlog_do_db, binlog_ignore_db) &&
- db_ok_with_wild_table(table->s->db) &&
+ rpl_filter->db_ok(table->s->db) &&
+ rpl_filter->db_ok_with_wild_table(table->s->db) &&
strcmp(table->s->db, "mysql") != 0;
}
@@ -2678,7 +2678,7 @@
{
MY_BITMAP cols;
/* Potential buffer on the stack for the bitmap */
- uchar bitbuf[BITMAP_STACKBUF_SIZE];
+ uint32 bitbuf[BITMAP_STACKBUF_SIZE/sizeof(uint32)];
uint n_fields= table->s->fields;
my_bool use_bitbuf= n_fields <= sizeof(bitbuf)*8;
bitmap_init(&cols,
--- 1.186/sql/log_event.cc 2005-08-16 16:54:09 +02:00
+++ 1.187/sql/log_event.cc 2005-08-17 10:27:43 +02:00
@@ -4884,7 +4884,7 @@
m_flags(0)
{
DBUG_ENTER("Rows_log_event::Rows_log_event(THD*, ...)");
- DBUG_PRINT("enter", ("cols->bitmap_size=%u", cols->bitmap_size));
+ DBUG_PRINT("enter", ("cols->bitmap_size=%u", byte_count(cols)));
if (thd_arg->options & OPTION_NO_FOREIGN_KEY_CHECKS)
set_flags(NO_FOREIGN_KEY_CHECKS_F);
@@ -5427,7 +5427,7 @@
int error= 0;
- if (!table_rules_on || tables_ok(thd, &table_list))
+ if (!rpl_filter->is_on() || rpl_filter->tables_ok("", &table_list))
{
/*
Open the table if it is not already open and add the table to table map.
@@ -5788,7 +5788,7 @@
{
/* We have a key: search the table using the index */
if (!table->file->inited)
- error= table->file->ha_index_init(0);
+ error= table->file->ha_index_init(0, false);
}
else
{
@@ -5946,7 +5946,7 @@
{
/* We have a key: search the table using the index */
if (!table->file->inited)
- error= table->file->ha_index_init(0);
+ error= table->file->ha_index_init(0, false);
}
else
{
--- 1.118/sql/log_event.h 2005-08-04 16:18:42 +02:00
+++ 1.119/sql/log_event.h 2005-08-17 10:27:43 +02:00
@@ -1785,7 +1785,7 @@
Helper function to count the number of bytes in a bitmap.
*/
static my_size_t byte_count(MY_BITMAP const *const bits) {
- return bits->bitmap_size;
+ return no_bytes_in_map(bits);
}
virtual void do_add_row_data(byte *data, my_size_t length);
@@ -1803,7 +1803,7 @@
ulong m_width; /* The width of the columns bitmap */
/* Bit buffer in the same memory as the class */
- uchar m_bitbuf[128/(sizeof(uchar)*8)];
+ uint32 m_bitbuf[128/(sizeof(uint32)*8)];
ulong m_thread_id; /* Thread ID */
--- 1.253/sql/slave.cc 2005-08-16 18:10:46 +02:00
+++ 1.254/sql/slave.cc 2005-08-17 10:27:43 +02:00
@@ -39,7 +39,7 @@
volatile bool slave_sql_running = 0, slave_io_running = 0;
char* slave_load_tmpdir = 0;
MASTER_INFO *active_mi;
-bool table_rules_on= 0, replicate_same_server_id;
+bool replicate_same_server_id;
ulonglong relay_log_space_limit = 0;
/*
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.1892) | tomas | 17 Aug |
