Below is the list of changes that have just been committed into a local
5.1 repository of Chuck. When Chuck 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@stripped, 2006-12-07 09:19:56-05:00, cbell@stripped +5 -0
Merge suse.vabb.com:/home/Chuck/development/mysql-5.1-new-rpl
into suse.vabb.com:/home/Chuck/development/mysql-5.1_WL_3618
MERGE: 1.2372.1.1
sql/log.cc@stripped, 2006-12-07 09:19:50-05:00, cbell@stripped +0 -0
Auto merged
MERGE: 1.243.1.1
sql/mysql_priv.h@stripped, 2006-12-07 09:19:50-05:00, cbell@stripped +0 -0
Auto merged
MERGE: 1.457.1.1
sql/set_var.cc@stripped, 2006-12-07 09:19:50-05:00, cbell@stripped +0 -0
Auto merged
MERGE: 1.200.1.1
sql/set_var.h@stripped, 2006-12-07 09:19:50-05:00, cbell@stripped +0 -0
Auto merged
MERGE: 1.93.1.1
sql/table.cc@stripped, 2006-12-07 09:19:50-05:00, cbell@stripped +0 -0
Auto merged
MERGE: 1.254.1.1
# 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: cbell
# Host: suse.vabb.com
# Root: /home/Chuck/development/mysql-5.1_WL_3618/RESYNC
--- 1.244/sql/log.cc 2006-12-05 07:07:18 -05:00
+++ 1.245/sql/log.cc 2006-12-07 09:19:50 -05:00
@@ -87,18 +87,14 @@
class binlog_trx_data {
public:
binlog_trx_data()
-#ifdef HAVE_ROW_BASED_REPLICATION
: m_pending(0), before_stmt_pos(MY_OFF_T_UNDEF)
-#endif
{
trans_log.end_of_file= max_binlog_cache_size;
}
~binlog_trx_data()
{
-#ifdef HAVE_ROW_BASED_REPLICATION
DBUG_ASSERT(pending() == NULL);
-#endif
close_cached_file(&trans_log);
}
@@ -108,11 +104,7 @@
bool empty() const
{
-#ifdef HAVE_ROW_BASED_REPLICATION
return pending() == NULL && my_b_tell(&trans_log) == 0;
-#else
- return my_b_tell(&trans_log) == 0;
-#endif
}
/*
@@ -121,10 +113,8 @@
*/
void truncate(my_off_t pos)
{
-#ifdef HAVE_ROW_BASED_REPLICATION
delete pending();
set_pending(0);
-#endif
reinit_io_cache(&trans_log, WRITE_CACHE, pos, 0, 0);
}
@@ -135,13 +125,10 @@
void reset() {
if (!empty())
truncate(0);
-#ifdef HAVE_ROW_BASED_REPLICATION
before_stmt_pos= MY_OFF_T_UNDEF;
-#endif
trans_log.end_of_file= max_binlog_cache_size;
}
-#ifdef HAVE_ROW_BASED_REPLICATION
Rows_log_event *pending() const
{
return m_pending;
@@ -151,12 +138,10 @@
{
m_pending= pending;
}
-#endif
IO_CACHE trans_log; // The transaction cache
private:
-#ifdef HAVE_ROW_BASED_REPLICATION
/*
Pending binrows event. This event is the event where the rows are
currently written.
@@ -168,7 +153,6 @@
Binlog position before the start of the current statement.
*/
my_off_t before_stmt_pos;
-#endif
};
handlerton *binlog_hton;
@@ -1468,9 +1452,7 @@
were, we would have to ensure that we're not ending a statement
inside a stored function.
*/
-#ifdef HAVE_ROW_BASED_REPLICATION
thd->binlog_flush_pending_rows_event(TRUE);
-#endif
/*
We write the transaction cache to the binary log if either we're
committing the entire transaction, or if we are doing an
@@ -1480,13 +1462,11 @@
{
error= mysql_bin_log.write(thd, &trx_data->trans_log, end_ev);
trx_data->reset();
-#ifdef HAVE_ROW_BASED_REPLICATION
/*
We need to step the table map version after writing the
transaction cache to disk.
*/
mysql_bin_log.update_table_map_version();
-#endif
statistic_increment(binlog_cache_use, &LOCK_status);
if (trans_log->disk_writes != 0)
{
@@ -1495,7 +1475,6 @@
}
}
}
-#ifdef HAVE_ROW_BASED_REPLICATION
else
{
/*
@@ -1518,7 +1497,6 @@
*/
mysql_bin_log.update_table_map_version();
}
-#endif
DBUG_RETURN(error);
}
@@ -3385,7 +3363,6 @@
DBUG_RETURN(0);
}
-#ifdef HAVE_ROW_BASED_REPLICATION
/*
Function to start a statement and optionally a transaction for the
binary log.
@@ -3593,7 +3570,6 @@
DBUG_RETURN(error);
}
-#endif /*HAVE_ROW_BASED_REPLICATION*/
/*
Write an event to the binary log
@@ -3626,11 +3602,9 @@
we are inside a stored function, we do not end the statement since
this will close all tables on the slave.
*/
-#ifdef HAVE_ROW_BASED_REPLICATION
bool const end_stmt=
thd->prelocked_mode && thd->lex->requires_prelocking();
thd->binlog_flush_pending_rows_event(end_stmt);
-#endif /*HAVE_ROW_BASED_REPLICATION*/
pthread_mutex_lock(&LOCK_log);
@@ -3660,7 +3634,7 @@
}
#endif /* HAVE_REPLICATION */
-#if defined(USING_TRANSACTIONS) && defined(HAVE_ROW_BASED_REPLICATION)
+#if defined(USING_TRANSACTIONS)
/*
Should we write to the binlog cache or to the binlog on disk?
Write to the binlog cache if:
@@ -3695,7 +3669,7 @@
LOCK_log.
*/
}
-#endif /* USING_TRANSACTIONS && HAVE_ROW_BASED_REPLICATION */
+#endif /* USING_TRANSACTIONS */
DBUG_PRINT("info",("event type: %d",event_info->get_type_code()));
/*
--- 1.458/sql/mysql_priv.h 2006-12-05 07:07:19 -05:00
+++ 1.459/sql/mysql_priv.h 2006-12-07 09:19:50 -05:00
@@ -1561,9 +1561,7 @@
extern ulong max_prepared_stmt_count, prepared_stmt_count;
extern ulong binlog_cache_size, max_binlog_cache_size, open_files_limit;
extern ulong max_binlog_size, max_relay_log_size;
-#ifdef HAVE_ROW_BASED_REPLICATION
extern ulong opt_binlog_rows_event_max_size;
-#endif
extern ulong rpl_recovery_rank, thread_cache_size;
extern ulong back_log;
extern ulong specialflag, current_pid;
@@ -1668,7 +1666,6 @@
extern handlerton *myisam_hton;
extern handlerton *heap_hton;
-extern SHOW_COMP_OPTION have_row_based_replication;
extern SHOW_COMP_OPTION have_openssl, have_symlink, have_dlopen;
extern SHOW_COMP_OPTION have_query_cache;
extern SHOW_COMP_OPTION have_geometry, have_rtree_keys;
--- 1.255/sql/table.cc 2006-11-26 08:55:43 -05:00
+++ 1.256/sql/table.cc 2006-12-07 09:19:50 -05:00
@@ -123,7 +123,6 @@
share->version= refresh_version;
share->flush_version= flush_version;
-#ifdef HAVE_ROW_BASED_REPLICATION
/*
This constant is used to mark that no table map version has been
assigned. No arithmetic is done on the value: it will be
@@ -141,8 +140,6 @@
share->table_map_id= ~0UL;
share->cached_row_logging_check= -1;
-#endif
-
memcpy((char*) &share->mem_root, (char*) &mem_root, sizeof(mem_root));
pthread_mutex_init(&share->mutex, MY_MUTEX_INIT_FAST);
pthread_cond_init(&share->cond, NULL);
@@ -194,7 +191,6 @@
share->path.length= share->normalized_path.length= strlen(path);
share->frm_version= FRM_VER_TRUE_VARCHAR;
-#ifdef HAVE_ROW_BASED_REPLICATION
/*
Temporary tables are not replicated, but we set up these fields
anyway to be able to catch errors.
@@ -202,7 +198,6 @@
share->table_map_version= ~(ulonglong)0;
share->table_map_id= ~0UL;
share->cached_row_logging_check= -1;
-#endif
DBUG_VOID_RETURN;
}
--- 1.201/sql/set_var.cc 2006-12-05 07:07:19 -05:00
+++ 1.202/sql/set_var.cc 2006-12-07 09:19:50 -05:00
@@ -682,7 +682,6 @@
&have_query_cache);
sys_var_have_variable sys_have_rtree_keys("have_rtree_keys", &have_rtree_keys);
sys_var_have_variable sys_have_symlink("have_symlink", &have_symlink);
-sys_var_have_variable sys_have_row_based_replication("have_row_based_replication",&have_row_based_replication);
/* Global read-only variable describing server license */
sys_var_const_str sys_license("license", STRINGIFY_ARG(LICENSE));
@@ -809,7 +808,6 @@
{sys_have_openssl.name, (char*) &have_openssl, SHOW_HAVE},
{sys_have_partition_db.name,(char*) &have_partition_db, SHOW_HAVE},
{sys_have_query_cache.name, (char*) &have_query_cache, SHOW_HAVE},
- {sys_have_row_based_replication.name, (char*) &have_row_based_replication, SHOW_HAVE},
{sys_have_rtree_keys.name, (char*) &have_rtree_keys, SHOW_HAVE},
{sys_have_symlink.name, (char*) &have_symlink, SHOW_HAVE},
{"init_connect", (char*) &sys_init_connect, SHOW_SYS},
@@ -1324,10 +1322,6 @@
If we don't have row-based replication compiled in, the variable
is always read-only.
*/
-#ifndef HAVE_ROW_BASED_REPLICATION
- my_error(ER_RBR_NOT_AVAILABLE, MYF(0));
- return 1;
-#else
if ((thd->variables.binlog_format == BINLOG_FORMAT_ROW) &&
thd->temporary_tables)
{
@@ -1352,16 +1346,13 @@
return 1;
}
#endif /* HAVE_NDB_BINLOG */
-#endif /* HAVE_ROW_BASED_REPLICATION */
return sys_var_thd_enum::is_readonly();
}
void fix_binlog_format_after_update(THD *thd, enum_var_type type)
{
-#ifdef HAVE_ROW_BASED_REPLICATION
thd->reset_current_stmt_binlog_row_based();
-#endif /*HAVE_ROW_BASED_REPLICATION*/
}
--- 1.94/sql/set_var.h 2006-12-05 07:07:19 -05:00
+++ 1.95/sql/set_var.h 2006-12-07 09:19:50 -05:00
@@ -944,9 +944,7 @@
}
};
-#ifdef HAVE_ROW_BASED_REPLICATION
extern void fix_binlog_format_after_update(THD *thd, enum_var_type type);
-#endif
class sys_var_thd_binlog_format :public sys_var_thd_enum
{
@@ -954,9 +952,7 @@
sys_var_thd_binlog_format(const char *name_arg, ulong SV::*offset_arg)
:sys_var_thd_enum(name_arg, offset_arg,
&binlog_format_typelib
-#ifdef HAVE_ROW_BASED_REPLICATION
, fix_binlog_format_after_update
-#endif
)
{};
bool is_readonly() const;
| Thread |
|---|
| • bk commit into 5.1 tree (cbell:1.2376) | cbell | 7 Dec |
