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.1882 05/08/17 13:29:16 tomas@stripped +8 -0
updated with treediff to get same as 5.0 rbr version
sql/slave.cc
1.255 05/08/17 13:29:11 tomas@stripped +0 -1
updated with treediff to get same as 5.0 rbr version
sql/log.cc
1.171 05/08/17 13:29:10 tomas@stripped +10 -8
updated with treediff to get same as 5.0 rbr version
sql/handler.h
1.156 05/08/17 13:29:10 tomas@stripped +1 -1
updated with treediff to get same as 5.0 rbr version
mysql-test/t/mysqlbinlog.test
1.21 05/08/17 13:29:10 tomas@stripped +1 -1
updated with treediff to get same as 5.0 rbr version
mysql-test/t/blackhole.test
1.7 05/08/17 13:29:10 tomas@stripped +0 -2
updated with treediff to get same as 5.0 rbr version
mysql-test/r/rpl_stm_until.result
1.26 05/08/17 13:29:10 tomas@stripped +2 -2
updated with treediff to get same as 5.0 rbr version
libmysql/Makefile.shared
1.68 05/08/17 13:29:10 tomas@stripped +0 -2
updated with treediff to get same as 5.0 rbr version
include/Makefile.am
1.56 05/08/17 13:29:10 tomas@stripped +0 -1
updated with treediff to get same as 5.0 rbr version
# 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-wl1012
--- 1.55/include/Makefile.am 2005-08-17 10:32:09 +02:00
+++ 1.56/include/Makefile.am 2005-08-17 13:29:10 +02:00
@@ -20,7 +20,6 @@
mysql.h mysql_com.h mysql_embed.h \
my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
errmsg.h my_global.h my_net.h my_alloc.h \
- my_vle.h \
my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
mysql_time.h $(BUILT_SOURCES)
--- 1.155/sql/handler.h 2005-08-17 12:40:24 +02:00
+++ 1.156/sql/handler.h 2005-08-17 13:29:10 +02:00
@@ -747,7 +747,7 @@
MY_BITMAP *read_set;
MY_BITMAP *write_set;
- handler(const handlerton *ht_arg, TABLE *table_arg)
+ handler(const handlerton *ht_arg, TABLE *table_arg, ulong rplf= 0UL)
:table(table_arg), ht(ht_arg),
ref(0), data_file_length(0), max_data_file_length(0), index_file_length(0),
delete_length(0), auto_increment_value(0),
--- 1.170/sql/log.cc 2005-08-17 10:39:39 +02:00
+++ 1.171/sql/log.cc 2005-08-17 13:29:10 +02:00
@@ -1602,22 +1602,24 @@
"do the involved tables match (to be implemented)
binlog_[wild_]{do|ignore}_table?" (WL#1049)"
*/
- if (thd && !(thd->options & OPTION_BIN_LOG) ||
- (!binlog_filter->db_ok(local_db)))
+ if ((thd && !(thd->options & OPTION_BIN_LOG)) ||
+ (!binlog_filter->db_ok(local_db)))
{
VOID(pthread_mutex_unlock(&LOCK_log));
+ DBUG_PRINT("info",("db_ok('%s')==%d", local_db,
+ binlog_filter->db_ok(local_db)));
DBUG_RETURN(0);
}
#endif /* HAVE_REPLICATION */
#ifdef USING_TRANSACTIONS
/*
- Should we write to the binlog cache or to the binlog on disk? Write to
- the binlog cache if the binlog cache:
- - is already not empty (meaning we're in a transaction; note that the
- present event could be about a non-transactional table, but still we
- need to write to the binlog cache in that case to handle updates to
- mixed trans/non-trans table types the best possible in binlogging)
+ Should we write to the binlog cache or to the binlog on disk?
+ Write to the binlog cache if:
+ - it is already not empty (meaning we're in a transaction; note that the
+ present event could be about a non-transactional table, but still we need
+ to write to the binlog cache in that case to handle updates to mixed
+ trans/non-trans table types the best possible in binlogging)
- or if the event asks for it (cache_stmt == TRUE).
*/
if (opt_using_transactions && thd)
--- 1.254/sql/slave.cc 2005-08-17 10:47:44 +02:00
+++ 1.255/sql/slave.cc 2005-08-17 13:29:11 +02:00
@@ -25,7 +25,6 @@
#include <thr_alarm.h>
#include <my_dir.h>
#include <sql_common.h>
-#include "rpl_tblmap.h"
#ifdef HAVE_REPLICATION
--- 1.6/mysql-test/t/blackhole.test 2005-08-17 10:32:10 +02:00
+++ 1.7/mysql-test/t/blackhole.test 2005-08-17 13:29:10 +02:00
@@ -3,8 +3,6 @@
# Taken from the select test
#
-- source include/have_blackhole.inc
-# result file differs because of a show binlog events
--- source include/have_binlog_format_statement.inc
#
# The test is dependent on statement-based logging since it uses SHOW
--- 1.25/mysql-test/r/rpl_stm_until.result 2005-08-17 10:33:33 +02:00
+++ 1.26/mysql-test/r/rpl_stm_until.result 2005-08-17 13:29:10 +02:00
@@ -48,7 +48,7 @@
# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 780 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 780 # Master master-bin.000001 776 No #
start slave until master_log_file='master-bin', master_log_pos=561;
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
-start slave until master_log_file='master-bin.000001', master_log_pos=561, relay_log_pos=16;
+start slave until master_log_file='master-bin.000001', master_log_pos=561, relay_log_pos=12;
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
start slave until master_log_file='master-bin.000001';
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
@@ -57,6 +57,6 @@
start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=561;
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
start slave sql_thread;
-start slave until master_log_file='master-bin.000001', master_log_pos=787;
+start slave until master_log_file='master-bin.000001', master_log_pos=776;
Warnings:
Note 1254 Slave is already running
--- 1.20/mysql-test/t/mysqlbinlog.test 2005-08-17 10:32:10 +02:00
+++ 1.21/mysql-test/t/mysqlbinlog.test 2005-08-17 13:29:10 +02:00
@@ -107,7 +107,7 @@
--exec cat $MYSQL_TEST_DIR/std_data/trunc_binlog.000001 | $MYSQL_BINLOG --short-form -
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec cat $MYSQL_TEST_DIR/std_data/trunc_binlog.000001 | $MYSQL_BINLOG --short-form --position=83 -
+--exec cat $MYSQL_TEST_DIR/std_data/trunc_binlog.000001 | $MYSQL_BINLOG --short-form --position=79 -
# clean up
drop table t1, t2;
--- 1.67/libmysql/Makefile.shared 2005-08-17 10:32:09 +02:00
+++ 1.68/libmysql/Makefile.shared 2005-08-17 13:29:10 +02:00
@@ -56,8 +56,6 @@
my_create.lo my_delete.lo mf_tempfile.lo my_open.lo \
my_file.lo my_read.lo my_write.lo errors.lo \
my_error.lo my_getwd.lo my_div.lo \
- my_bitmap.lo my_bit.lo \
- my_vle.lo \
mf_pack.lo my_messnc.lo mf_dirname.lo mf_fn_ext.lo\
mf_wcomp.lo typelib.lo safemalloc.lo my_alloc.lo \
mf_format.lo mf_path.lo mf_unixpath.lo my_fopen.lo \
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.1882) | tomas | 17 Aug |
