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:18:35-05:00, cbell@stripped +41 -0
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
BitKeeper/deleted/.del-have_row_based.inc@stripped, 2006-12-07 09:06:07-05:00, cbell@stripped +0 -0
Delete: mysql-test/include/have_row_based.inc
BitKeeper/deleted/.del-have_row_based.require@stripped, 2006-12-07 09:05:47-05:00, cbell@stripped +0 -0
Delete: mysql-test/r/have_row_based.require
BitKeeper/deleted/.del-not_row_based.inc@stripped, 2006-12-07 09:06:13-05:00, cbell@stripped +0 -0
Delete: mysql-test/include/not_row_based.inc
BitKeeper/deleted/.del-not_row_based.require@stripped, 2006-12-07 09:05:54-05:00, cbell@stripped +0 -0
Delete: mysql-test/r/not_row_based.require
BitKeeper/deleted/.del-replication.m4@stripped, 2006-12-07 09:11:12-05:00, cbell@stripped +0 -0
Delete: config/ac-macros/replication.m4
config/ac-macros/replication.m4@stripped, 2006-12-07 09:07:41-05:00, cbell@stripped +0 -0
Rename: BitKeeper/deleted/.del-replication.m4 -> config/ac-macros/replication.m4
BitKeeper/deleted/.del-replication.m4@stripped, 2006-12-07 09:03:59-05:00, Chuck@stripped +0 -0
Delete: config/ac-macros/replication.m4
config/ac-macros/replication.m4@stripped, 2006-12-07 09:03:27-05:00, Chuck@stripped +0 -28
WL#3618 Remove HAVE_ROW_BASED_REPLICATION #fidef macros
config/ac-macros/ha_ndbcluster.m4@stripped, 2006-12-07 09:18:27-05:00, cbell@stripped +1 -4
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
configure.in@stripped, 2006-12-07 09:18:27-05:00, cbell@stripped +0 -1
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
include/config-win.h@stripped, 2006-12-07 09:18:27-05:00, cbell@stripped +0 -1
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
include/my_global.h@stripped, 2006-12-07 09:18:27-05:00, cbell@stripped +0 -3
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
libmysqld/CMakeLists.txt@stripped, 2006-12-07 09:18:27-05:00, cbell@stripped +1 -2
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
mysql-test/extra/rpl_tests/rpl_row_basic.test@stripped, 2006-12-07 09:18:27-05:00, cbell@stripped +0 -1
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
mysql-test/extra/rpl_tests/rpl_truncate.test@stripped, 2006-12-07 09:18:27-05:00, cbell@stripped +0 -1
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
mysql-test/t/rpl_rbr_to_sbr.test@stripped, 2006-12-07 09:18:27-05:00, cbell@stripped +0 -1
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
mysql-test/t/rpl_row_basic_11bugs.test@stripped, 2006-12-07 09:18:27-05:00, cbell@stripped +0 -1
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
mysql-test/t/rpl_row_basic_8partition.test@stripped, 2006-12-07 09:18:27-05:00, cbell@stripped +0 -1
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
mysql-test/t/rpl_row_max_relay_size.test@stripped, 2006-12-07 09:18:27-05:00, cbell@stripped +0 -1
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
mysql-test/t/rpl_switch_stm_row_mixed.test@stripped, 2006-12-07 09:18:27-05:00, cbell@stripped +0 -1
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
sql/CMakeLists.txt@stripped, 2006-12-07 09:18:27-05:00, cbell@stripped +1 -2
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
sql/handler.cc@stripped, 2006-12-07 09:18:27-05:00, cbell@stripped +0 -8
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
sql/item_create.cc@stripped, 2006-12-07 09:18:27-05:00, cbell@stripped +0 -4
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
sql/log.cc@stripped, 2006-12-07 09:18:27-05:00, cbell@stripped +2 -28
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
sql/log.h@stripped, 2006-12-07 09:18:27-05:00, cbell@stripped +0 -2
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
sql/log_event.cc@stripped, 2006-12-07 09:18:28-05:00, cbell@stripped +7 -10
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
sql/log_event.h@stripped, 2006-12-07 09:18:28-05:00, cbell@stripped +3 -7
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
sql/mysql_priv.h@stripped, 2006-12-07 09:18:28-05:00, cbell@stripped +0 -3
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
sql/mysqld.cc@stripped, 2006-12-07 09:18:28-05:00, cbell@stripped +0 -40
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
sql/rpl_injector.cc@stripped, 2006-12-07 09:18:28-05:00, cbell@stripped +0 -3
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
sql/rpl_injector.h@stripped, 2006-12-07 09:18:28-05:00, cbell@stripped +0 -2
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
sql/set_var.cc@stripped, 2006-12-07 09:18:28-05:00, cbell@stripped +0 -9
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
sql/set_var.h@stripped, 2006-12-07 09:18:28-05:00, cbell@stripped +0 -4
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
sql/sp_head.cc@stripped, 2006-12-07 09:18:28-05:00, cbell@stripped +0 -2
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
sql/sp_head.h@stripped, 2006-12-07 09:18:28-05:00, cbell@stripped +0 -2
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
sql/sql_base.cc@stripped, 2006-12-07 09:18:28-05:00, cbell@stripped +0 -6
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
sql/sql_class.cc@stripped, 2006-12-07 09:18:28-05:00, cbell@stripped +0 -17
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
sql/sql_class.h@stripped, 2006-12-07 09:18:29-05:00, cbell@stripped +0 -15
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
sql/sql_insert.cc@stripped, 2006-12-07 09:18:29-05:00, cbell@stripped +0 -9
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
sql/sql_lex.cc@stripped, 2006-12-07 09:18:29-05:00, cbell@stripped +0 -2
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
sql/sql_lex.h@stripped, 2006-12-07 09:18:29-05:00, cbell@stripped +0 -2
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
sql/sql_load.cc@stripped, 2006-12-07 09:18:29-05:00, cbell@stripped +0 -2
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
sql/sql_view.cc@stripped, 2006-12-07 09:18:29-05:00, cbell@stripped +0 -2
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
sql/table.cc@stripped, 2006-12-07 09:18:29-05:00, cbell@stripped +0 -5
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
# 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
--- 1.399/configure.in 2006-11-15 07:17:41 -05:00
+++ 1.400/configure.in 2006-12-07 09:18:27 -05:00
@@ -2154,7 +2154,6 @@
MYSQL_CHECK_BIG_TABLES
MYSQL_CHECK_MAX_INDEXES
-MYSQL_CHECK_REPLICATION
MYSQL_CHECK_VIO
MYSQL_CHECK_SSL
--- 1.91/include/config-win.h 2006-09-21 09:19:15 -04:00
+++ 1.92/include/config-win.h 2006-12-07 09:18:27 -05:00
@@ -436,7 +436,6 @@
#define HAVE_SPATIAL 1
#define HAVE_RTREE_KEYS 1
-#define HAVE_ROW_BASED_REPLICATION 1
#define HAVE_OPENSSL 1
#define HAVE_YASSL 1
--- 1.279/sql/handler.cc 2006-11-13 06:45:26 -05:00
+++ 1.280/sql/handler.cc 2006-12-07 09:18:27 -05:00
@@ -3455,7 +3455,6 @@
- table is not mysql.event
*/
-#ifdef HAVE_ROW_BASED_REPLICATION
/* The Sun compiler cannot instantiate the template below if this is
declared static, but it works by putting it into an anonymous
namespace. */
@@ -3608,7 +3607,6 @@
binlog_log_row<Update_rows_log_event>(TABLE *, const byte *, const byte *);
}
-#endif /* HAVE_ROW_BASED_REPLICATION */
int handler::ha_external_lock(THD *thd, int lock_type)
{
@@ -3649,10 +3647,8 @@
int error;
if (unlikely(error= write_row(buf)))
return error;
-#ifdef HAVE_ROW_BASED_REPLICATION
if (unlikely(error= binlog_log_row<Write_rows_log_event>(table, 0, buf)))
return error;
-#endif
return 0;
}
@@ -3668,10 +3664,8 @@
if (unlikely(error= update_row(old_data, new_data)))
return error;
-#ifdef HAVE_ROW_BASED_REPLICATION
if (unlikely(error= binlog_log_row<Update_rows_log_event>(table, old_data, new_data)))
return error;
-#endif
return 0;
}
@@ -3680,10 +3674,8 @@
int error;
if (unlikely(error= delete_row(buf)))
return error;
-#ifdef HAVE_ROW_BASED_REPLICATION
if (unlikely(error= binlog_log_row<Delete_rows_log_event>(table, buf, 0)))
return error;
-#endif
return 0;
}
--- 1.67/sql/item_create.cc 2006-11-02 13:01:49 -05:00
+++ 1.68/sql/item_create.cc 2006-12-07 09:18:27 -05:00
@@ -2288,9 +2288,7 @@
if (item_list != NULL)
arg_count= item_list->elements;
-#ifdef HAVE_ROW_BASED_REPLICATION
thd->lex->binlog_row_based_if_mixed= TRUE;
-#endif
DBUG_ASSERT( (udf->type == UDFTYPE_FUNCTION)
|| (udf->type == UDFTYPE_AGGREGATE));
@@ -4446,9 +4444,7 @@
Item*
Create_func_uuid::create(THD *thd)
{
-#ifdef HAVE_ROW_BASED_REPLICATION
thd->lex->binlog_row_based_if_mixed= TRUE;
-#endif
return new (thd->mem_root) Item_func_uuid();
}
--- 1.243/sql/log.cc 2006-11-15 07:15:58 -05:00
+++ 1.244/sql/log.cc 2006-12-07 09:18:27 -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.254/sql/log_event.cc 2006-11-21 20:24:13 -05:00
+++ 1.255/sql/log_event.cc 2006-12-07 09:18:28 -05:00
@@ -994,7 +994,7 @@
case FORMAT_DESCRIPTION_EVENT:
ev = new Format_description_log_event(buf, event_len, description_event);
break;
-#if defined(HAVE_REPLICATION) && defined(HAVE_ROW_BASED_REPLICATION)
+#if defined(HAVE_REPLICATION)
case WRITE_ROWS_EVENT:
ev = new Write_rows_log_event(buf, event_len, description_event);
break;
@@ -5287,8 +5287,6 @@
}
-#ifdef HAVE_ROW_BASED_REPLICATION
-
/**************************************************************************
Rows_log_event member functions
**************************************************************************/
@@ -5553,8 +5551,8 @@
if (bitmap_is_set(cols, field_ptr - begin_ptr))
{
- DBUG_ASSERT(table->record[0] <= f->ptr);
- DBUG_ASSERT(f->ptr < table->record[0] + table->s->reclength + (f->pack_length_in_rec() == 0));
+ DBUG_ASSERT((char *)table->record[0] <= f->ptr);
+ DBUG_ASSERT(f->ptr < (char *)table->record[0] + table->s->reclength + (f->pack_length_in_rec() == 0));
f->move_field_offset(offset);
DBUG_PRINT("info", ("unpacking column '%s' to 0x%lx", f->field_name, f->ptr));
@@ -6838,8 +6836,8 @@
trigger false warnings.
*/
#ifndef HAVE_purify
- DBUG_DUMP("table->record[0]", table->record[0], table->s->reclength);
- DBUG_DUMP("table->record[1]", table->record[1], table->s->reclength);
+ DBUG_DUMP("table->record[0]", (char *)table->record[0], table->s->reclength);
+ DBUG_DUMP("table->record[1]", (char *)table->record[1], table->s->reclength);
#endif
/*
@@ -6865,8 +6863,8 @@
trigger false warnings.
*/
#ifndef HAVE_purify
- DBUG_DUMP("table->record[0]", table->record[0], table->s->reclength);
- DBUG_DUMP("table->record[1]", table->record[1], table->s->reclength);
+ DBUG_DUMP("table->record[0]", (char *)table->record[0], table->s->reclength);
+ DBUG_DUMP("table->record[1]", (char *)table->record[1], table->s->reclength);
#endif
/*
Below is a minor "optimization". If the key (i.e., key number
@@ -7279,4 +7277,3 @@
}
#endif
-#endif /* defined(HAVE_ROW_BASED_REPLICATION) */
--- 1.138/sql/log_event.h 2006-11-14 06:04:36 -05:00
+++ 1.139/sql/log_event.h 2006-12-07 09:18:28 -05:00
@@ -1689,8 +1689,6 @@
#endif
char *str_to_hex(char *to, const char *from, uint len);
-#ifdef HAVE_ROW_BASED_REPLICATION
-
/*****************************************************************************
Table map log event class
@@ -2019,7 +2017,7 @@
Write_rows_log_event(const char *buf, uint event_len,
const Format_description_log_event *description_event);
#endif
-#if !defined(MYSQL_CLIENT) && defined(HAVE_ROW_BASED_REPLICATION)
+#if !defined(MYSQL_CLIENT)
static bool binlog_row_logging_function(THD *thd, TABLE *table,
bool is_transactional,
MY_BITMAP *cols,
@@ -2084,7 +2082,7 @@
const Format_description_log_event *description_event);
#endif
-#if !defined(MYSQL_CLIENT) && defined(HAVE_ROW_BASED_REPLICATION)
+#if !defined(MYSQL_CLIENT)
static bool binlog_row_logging_function(THD *thd, TABLE *table,
bool is_transactional,
MY_BITMAP *cols,
@@ -2154,7 +2152,7 @@
Delete_rows_log_event(const char *buf, uint event_len,
const Format_description_log_event *description_event);
#endif
-#if !defined(MYSQL_CLIENT) && defined(HAVE_ROW_BASED_REPLICATION)
+#if !defined(MYSQL_CLIENT)
static bool binlog_row_logging_function(THD *thd, TABLE *table,
bool is_transactional,
MY_BITMAP *cols,
@@ -2187,7 +2185,5 @@
virtual int do_exec_row(TABLE *table);
#endif
};
-
-#endif /* HAVE_ROW_BASED_REPLICATION */
#endif /* _log_event_h */
--- 1.457/sql/mysql_priv.h 2006-11-13 07:09:59 -05:00
+++ 1.458/sql/mysql_priv.h 2006-12-07 09:18:28 -05:00
@@ -1557,9 +1557,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;
@@ -1664,7 +1662,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.590/sql/mysqld.cc 2006-11-13 06:45:26 -05:00
+++ 1.591/sql/mysqld.cc 2006-12-07 09:18:28 -05:00
@@ -28,9 +28,7 @@
#include "../storage/myisam/ha_myisam.h"
-#ifdef HAVE_ROW_BASED_REPLICATION
#include "rpl_injector.h"
-#endif
#ifdef WITH_INNOBASE_STORAGE_ENGINE
#define OPT_INNODB_DEFAULT 1
@@ -437,12 +435,8 @@
my_bool opt_noacl;
my_bool sp_automatic_privileges= 1;
-#ifdef HAVE_ROW_BASED_REPLICATION
ulong opt_binlog_rows_event_max_size;
const char *binlog_format_names[]= {"STATEMENT", "ROW", "MIXED", NullS};
-#else
-const char *binlog_format_names[]= {"STATEMENT", NullS};
-#endif
TYPELIB binlog_format_typelib=
{ array_elements(binlog_format_names)-1,"",
binlog_format_names, NULL };
@@ -554,7 +548,6 @@
CHARSET_INFO *national_charset_info, *table_alias_charset;
CHARSET_INFO *character_set_filesystem;
-SHOW_COMP_OPTION have_row_based_replication;
SHOW_COMP_OPTION have_openssl, have_symlink, have_dlopen, have_query_cache;
SHOW_COMP_OPTION have_geometry, have_rtree_keys;
SHOW_COMP_OPTION have_crypt, have_compress;
@@ -1162,9 +1155,7 @@
what they have that is dependent on the binlog
*/
ha_binlog_end(current_thd);
-#ifdef HAVE_ROW_BASED_REPLICATION
injector::free_instance();
-#endif
mysql_bin_log.cleanup();
#ifdef HAVE_REPLICATION
@@ -3149,11 +3140,7 @@
}
if (global_system_variables.binlog_format == BINLOG_FORMAT_UNSPEC)
{
-#if defined(HAVE_ROW_BASED_REPLICATION)
global_system_variables.binlog_format= BINLOG_FORMAT_MIXED;
-#else
- global_system_variables.binlog_format= BINLOG_FORMAT_STMT;
-#endif
}
/* Check that we have not let the format to unspecified at this point */
@@ -4691,9 +4678,7 @@
#ifndef DBUG_OFF
OPT_BINLOG_SHOW_XID,
#endif
-#ifdef HAVE_ROW_BASED_REPLICATION
OPT_BINLOG_ROWS_EVENT_MAX_SIZE,
-#endif
OPT_WANT_CORE, OPT_CONCURRENT_INSERT,
OPT_MEMLOCK, OPT_MYISAM_RECOVER,
OPT_REPLICATE_REWRITE_DB, OPT_SERVER_ID,
@@ -4903,7 +4888,6 @@
(gptr*) &my_bind_addr_str, (gptr*) &my_bind_addr_str, 0, GET_STR,
REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"binlog_format", OPT_BINLOG_FORMAT,
-#ifdef HAVE_ROW_BASED_REPLICATION
"Tell the master the form of binary logging to use: either 'row' for "
"row-based binary logging, or 'statement' for statement-based binary "
"logging, or 'mixed'. 'mixed' is statement-based binary logging except "
@@ -4913,17 +4897,8 @@
#ifdef HAVE_NDB_BINLOG
"If ndbcluster is enabled, the default is 'row'."
#endif
-#else
- "Tell the master the form of binary logging to use: this build "
- "supports only statement-based binary logging, so only 'statement' is "
- "a legal value."
-#endif
, 0, 0, 0, GET_STR, REQUIRED_ARG,
-#ifdef HAVE_ROW_BASED_REPLICATION
BINLOG_FORMAT_MIXED
-#else
- BINLOG_FORMAT_STMT
-#endif
, 0, 0, 0, 0, 0 },
{"binlog-do-db", OPT_BINLOG_DO_DB,
"Tells the master it should log updates for the specified database, and exclude all others not explicitly mentioned.",
@@ -4931,7 +4906,6 @@
{"binlog-ignore-db", OPT_BINLOG_IGNORE_DB,
"Tells the master that updates to the given database should not be logged tothe binary log.",
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#ifdef HAVE_ROW_BASED_REPLICATION
{"binlog-row-event-max-size", OPT_BINLOG_ROWS_EVENT_MAX_SIZE,
"The maximum size of a row-based binary log event in bytes. Rows will be "
"grouped into events smaller than this size if possible. "
@@ -4943,7 +4917,6 @@
/* sub_size */ 0, /* block_size */ 256,
/* app_type */ 0
},
-#endif
{"bootstrap", OPT_BOOTSTRAP, "Used by mysql installation scripts.", 0, 0, 0,
GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
{"character-set-client-handshake", OPT_CHARACTER_SET_CLIENT_HANDSHAKE,
@@ -5204,11 +5177,9 @@
"If equal to 0 (the default), then when --log-bin is used, creation of "
"a stored function (or trigger) is allowed only to users having the SUPER privilege "
"and only if this stored function (trigger) may not break binary logging."
-#ifdef HAVE_ROW_BASED_REPLICATION
"Note that if ALL connections to this server ALWAYS use row-based binary "
"logging, the security issues do not exist and the binary logging cannot "
"break, so you can safely set this to 1."
-#endif
,(gptr*) &trust_function_creators, (gptr*) &trust_function_creators, 0,
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"log-error", OPT_ERROR_LOG_FILE, "Error log file.",
@@ -7056,11 +7027,6 @@
#else
have_partition_db= SHOW_OPTION_NO;
#endif
-#ifdef HAVE_ROW_BASED_REPLICATION
- have_row_based_replication= SHOW_OPTION_YES;
-#else
- have_row_based_replication= SHOW_OPTION_NO;
-#endif
#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
have_ndbcluster=SHOW_OPTION_DISABLED;
global_system_variables.ndb_index_stat_enable=FALSE;
@@ -7291,7 +7257,6 @@
int id;
if ((id= find_type(argument, &binlog_format_typelib, 2)) <= 0)
{
-#ifdef HAVE_ROW_BASED_REPLICATION
fprintf(stderr,
"Unknown binary log format: '%s' "
"(should be one of '%s', '%s', '%s')\n",
@@ -7299,11 +7264,6 @@
binlog_format_names[BINLOG_FORMAT_STMT],
binlog_format_names[BINLOG_FORMAT_ROW],
binlog_format_names[BINLOG_FORMAT_MIXED]);
-#else
- fprintf(stderr,
- "Unknown binary log format: '%s' (only legal value is '%s')\n",
- argument, binlog_format_names[BINLOG_FORMAT_STMT]);
-#endif
exit(1);
}
global_system_variables.binlog_format= id-1;
--- 1.360/sql/sql_base.cc 2006-11-03 05:46:44 -05:00
+++ 1.361/sql/sql_base.cc 2006-12-07 09:18:28 -05:00
@@ -1064,9 +1064,7 @@
handled either before writing a query log event (inside
binlog_query()) or when preparing a pending event.
*/
-#ifdef HAVE_ROW_BASED_REPLICATION
thd->binlog_flush_pending_rows_event(TRUE);
-#endif /*HAVE_ROW_BASED_REPLICATION*/
mysql_unlock_tables(thd, thd->lock);
thd->lock=0;
}
@@ -3312,13 +3310,11 @@
*need_reopen= FALSE;
-#ifdef HAVE_ROW_BASED_REPLICATION
/*
CREATE ... SELECT UUID() locks no tables, we have to test here.
*/
if (thd->lex->binlog_row_based_if_mixed)
thd->set_current_stmt_binlog_row_based_if_mixed();
-#endif /*HAVE_ROW_BASED_REPLICATION*/
if (!tables && !thd->lex->requires_prelocking())
DBUG_RETURN(0);
@@ -3350,7 +3346,6 @@
{
thd->in_lock_tables=1;
thd->options|= OPTION_TABLE_LOCK;
-#ifdef HAVE_ROW_BASED_REPLICATION
/*
If we have >= 2 different tables to update with auto_inc columns,
statement-based binlogging won't work. We can solve this problem in
@@ -3362,7 +3357,6 @@
thd->lex->binlog_row_based_if_mixed= TRUE;
thd->set_current_stmt_binlog_row_based_if_mixed();
}
-#endif
}
if (! (thd->lock= mysql_lock_tables(thd, start, (uint) (ptr - start),
--- 1.298/sql/sql_class.cc 2006-11-21 07:57:46 -05:00
+++ 1.299/sql/sql_class.cc 2006-12-07 09:18:28 -05:00
@@ -204,9 +204,7 @@
Open_tables_state(refresh_version), rli_fake(0),
lock_id(&main_lock_id),
user_time(0), in_sub_stmt(0),
-#ifdef HAVE_ROW_BASED_REPLICATION
binlog_table_maps(0),
-#endif /*HAVE_ROW_BASED_REPLICATION*/
global_read_lock(0), is_fatal_error(0),
rand_used(0), time_zone_used(0),
arg_of_last_insert_id_function(FALSE),
@@ -267,9 +265,7 @@
system_thread= NON_SYSTEM_THREAD;
cleanup_done= abort_on_warning= no_warnings_for_error= 0;
peer_port= 0; // For SHOW PROCESSLIST
-#ifdef HAVE_ROW_BASED_REPLICATION
transaction.m_pending_rows_event= 0;
-#endif
#ifdef __WIN__
real_id = 0;
#endif
@@ -349,9 +345,7 @@
bzero((char*) warn_count, sizeof(warn_count));
total_warn_count= 0;
update_charset();
-#ifdef HAVE_ROW_BASED_REPLICATION
reset_current_stmt_binlog_row_based();
-#endif /*HAVE_ROW_BASED_REPLICATION*/
bzero((char *) &status_var, sizeof(status_var));
variables.lc_time_names = &my_locale_en_US;
}
@@ -2334,7 +2328,6 @@
*/
#ifndef MYSQL_CLIENT
-#ifdef HAVE_ROW_BASED_REPLICATION
/*
Template member function for ensuring that there is an rows log
@@ -2825,8 +2818,6 @@
}
}
-#endif /* HAVE_ROW_BASED_REPLICATION */
-
/*
Member function that will log query, either row-based or
statement-based depending on the value of the 'current_stmt_binlog_row_based'
@@ -2867,18 +2858,14 @@
If we are in prelocked mode, the flushing will be done inside the
top-most close_thread_tables().
*/
-#ifdef HAVE_ROW_BASED_REPLICATION
if (this->prelocked_mode == NON_PRELOCKED)
if (int error= binlog_flush_pending_rows_event(TRUE))
DBUG_RETURN(error);
-#endif /*HAVE_ROW_BASED_REPLICATION*/
switch (qtype) {
case THD::ROW_QUERY_TYPE:
-#ifdef HAVE_ROW_BASED_REPLICATION
if (current_stmt_binlog_row_based)
DBUG_RETURN(0);
-#endif
/* Otherwise, we fall through */
case THD::MYSQL_QUERY_TYPE:
/*
@@ -2896,9 +2883,7 @@
*/
{
Query_log_event qinfo(this, query, query_len, is_trans, suppress_use);
-#ifdef HAVE_ROW_BASED_REPLICATION
qinfo.flags|= LOG_EVENT_UPDATE_TABLE_MAP_VERSION_F;
-#endif
/*
Binlog table maps will be irrelevant after a Query_log_event
(they are just removed on the slave side) so after the query
@@ -2906,9 +2891,7 @@
table maps were written.
*/
int error= mysql_bin_log.write(&qinfo);
-#ifdef HAVE_ROW_BASED_REPLICATION
binlog_table_maps= 0;
-#endif /*HAVE_ROW_BASED_REPLICATION*/
DBUG_RETURN(error);
}
break;
--- 1.326/sql/sql_class.h 2006-11-07 08:13:26 -05:00
+++ 1.327/sql/sql_class.h 2006-12-07 09:18:29 -05:00
@@ -930,8 +930,6 @@
#ifndef MYSQL_CLIENT
int binlog_setup_trx_data();
-#ifdef HAVE_ROW_BASED_REPLICATION
-
/*
Public interface to write RBR events to the binlog
*/
@@ -985,7 +983,6 @@
uint get_binlog_table_maps() const {
return binlog_table_maps;
}
-#endif /* HAVE_ROW_BASED_REPLICATION */
#endif /* MYSQL_CLIENT */
#ifndef MYSQL_CLIENT
@@ -1024,9 +1021,7 @@
XID xid; // transaction identifier
enum xa_states xa_state; // used by external XA only
XID_STATE xid_state;
-#ifdef HAVE_ROW_BASED_REPLICATION
Rows_log_event *m_pending_rows_event;
-#endif
/*
Tables changed in transaction (that must be invalidated in query cache).
@@ -1533,7 +1528,6 @@
void restore_active_arena(Query_arena *set, Query_arena *backup);
inline void set_current_stmt_binlog_row_based_if_mixed()
{
-#ifdef HAVE_ROW_BASED_REPLICATION
/*
If in a stored/function trigger, the caller should already have done the
change. We test in_sub_stmt to prevent introducing bugs where people
@@ -1546,23 +1540,17 @@
if ((variables.binlog_format == BINLOG_FORMAT_MIXED) &&
(in_sub_stmt == 0))
current_stmt_binlog_row_based= TRUE;
-#endif
}
inline void set_current_stmt_binlog_row_based()
{
-#ifdef HAVE_ROW_BASED_REPLICATION
current_stmt_binlog_row_based= TRUE;
-#endif
}
inline void clear_current_stmt_binlog_row_based()
{
-#ifdef HAVE_ROW_BASED_REPLICATION
current_stmt_binlog_row_based= FALSE;
-#endif
}
inline void reset_current_stmt_binlog_row_based()
{
-#ifdef HAVE_ROW_BASED_REPLICATION
/*
If there are temporary tables, don't reset back to
statement-based. Indeed it could be that:
@@ -1586,9 +1574,6 @@
current_stmt_binlog_row_based=
test(variables.binlog_format == BINLOG_FORMAT_ROW);
}
-#else
- current_stmt_binlog_row_based= FALSE;
-#endif
}
/*
--- 1.234/sql/sql_insert.cc 2006-11-07 08:13:26 -05:00
+++ 1.235/sql/sql_insert.cc 2006-12-07 09:18:29 -05:00
@@ -2279,7 +2279,6 @@
thd.proc_info=0;
pthread_mutex_unlock(&mutex);
-#ifdef HAVE_ROW_BASED_REPLICATION
/*
We need to flush the pending event when using row-based
replication since the flushing normally done in binlog_query() is
@@ -2294,7 +2293,6 @@
*/
if (thd.current_stmt_binlog_row_based)
thd.binlog_flush_pending_rows_event(TRUE);
-#endif /* HAVE_ROW_BASED_REPLICATION */
if ((error=table->file->extra(HA_EXTRA_NO_CACHE)))
{ // This shouldn't happen
@@ -2948,7 +2946,6 @@
DBUG_ENTER("select_create::prepare");
TABLEOP_HOOKS *hook_ptr= NULL;
-#ifdef HAVE_ROW_BASED_REPLICATION
class MY_HOOKS : public TABLEOP_HOOKS {
public:
MY_HOOKS(select_create *x) : ptr(x) { }
@@ -2970,11 +2967,9 @@
MY_HOOKS hooks(this);
hook_ptr= &hooks;
-#endif
unit= u;
-#ifdef HAVE_ROW_BASED_REPLICATION
/*
Start a statement transaction before the create if we are creating
a non-temporary table and are using row-based replication for the
@@ -2985,7 +2980,6 @@
{
thd->binlog_start_trans_and_stmt();
}
-#endif
if (!(table= create_table_from_items(thd, create_info, create_table,
extra_fields, keys, &values,
@@ -3029,8 +3023,6 @@
DBUG_RETURN(0);
}
-
-#ifdef HAVE_ROW_BASED_REPLICATION
void
select_create::binlog_show_create_table(TABLE **tables, uint count)
{
@@ -3071,7 +3063,6 @@
/* is_trans */ TRUE,
/* suppress_use */ FALSE);
}
-#endif // HAVE_ROW_BASED_REPLICATION
void select_create::store_values(List<Item> &values)
{
--- 1.207/sql/sql_lex.cc 2006-11-07 08:13:26 -05:00
+++ 1.208/sql/sql_lex.cc 2006-12-07 09:18:29 -05:00
@@ -1658,9 +1658,7 @@
sroutines_list.empty();
sroutines_list_own_last= sroutines_list.next;
sroutines_list_own_elements= 0;
-#ifdef HAVE_ROW_BASED_REPLICATION
binlog_row_based_if_mixed= FALSE;
-#endif
}
--- 1.251/sql/sql_lex.h 2006-11-07 08:13:26 -05:00
+++ 1.252/sql/sql_lex.h 2006-12-07 09:18:29 -05:00
@@ -811,7 +811,6 @@
byte **sroutines_list_own_last;
uint sroutines_list_own_elements;
-#ifdef HAVE_ROW_BASED_REPLICATION
/*
Tells if the parsing stage detected that some items require row-based
binlogging to give a reliable binlog/replication, or if we will use
@@ -819,7 +818,6 @@
binlogging.
*/
bool binlog_row_based_if_mixed;
-#endif
/*
These constructor and destructor serve for creation/destruction
--- 1.108/sql/sql_load.cc 2006-10-23 04:35:49 -04:00
+++ 1.109/sql/sql_load.cc 2006-12-07 09:18:29 -05:00
@@ -465,7 +465,6 @@
#ifndef EMBEDDED_LIBRARY
if (mysql_bin_log.is_open())
{
-#ifdef HAVE_ROW_BASED_REPLICATION
/*
We need to do the job that is normally done inside
binlog_query() here, which is to ensure that the pending event
@@ -477,7 +476,6 @@
if (thd->current_stmt_binlog_row_based)
thd->binlog_flush_pending_rows_event(true);
else
-#endif
{
/*
As already explained above, we need to call end_io_cache() or the last
--- 1.254/sql/table.cc 2006-11-21 07:57:46 -05:00
+++ 1.255/sql/table.cc 2006-12-07 09:18:29 -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.113/sql/sql_view.cc 2006-11-13 06:45:27 -05:00
+++ 1.114/sql/sql_view.cc 2006-12-07 09:18:29 -05:00
@@ -1090,14 +1090,12 @@
table->next_global= view_tables;
}
-#ifdef HAVE_ROW_BASED_REPLICATION
/*
If the view's body needs row-based binlogging (e.g. the VIEW is created
from SELECT UUID()), the top statement also needs it.
*/
if (lex->binlog_row_based_if_mixed)
old_lex->binlog_row_based_if_mixed= TRUE;
-#endif
bool view_is_mergeable= (table->algorithm != VIEW_ALGORITHM_TMPTABLE &&
lex->can_be_merged());
TABLE_LIST *view_main_select_tables;
--- 1.20/config/ac-macros/ha_ndbcluster.m4 2006-10-16 03:00:56 -04:00
+++ 1.21/config/ac-macros/ha_ndbcluster.m4 2006-12-07 09:18:27 -05:00
@@ -229,10 +229,7 @@
if test X"$ndb_binlog" = Xdefault ||
test X"$ndb_binlog" = Xyes
then
- if test X"$have_row_based" = Xyes
- then
- have_ndb_binlog="yes"
- fi
+ have_ndb_binlog="yes"
fi
if test X"$have_ndb_binlog" = Xyes
--- 1.12/mysql-test/t/rpl_switch_stm_row_mixed.test 2006-09-15 10:25:10 -04:00
+++ 1.13/mysql-test/t/rpl_switch_stm_row_mixed.test 2006-12-07 09:18:27 -05:00
@@ -1,4 +1,3 @@
--- source include/have_row_based.inc
-- source include/not_ndb_default.inc
-- source include/master-slave.inc
--- 1.10/libmysqld/CMakeLists.txt 2006-08-25 01:10:51 -04:00
+++ 1.11/libmysqld/CMakeLists.txt 2006-12-07 09:18:27 -05:00
@@ -3,8 +3,7 @@
# Need to set USE_TLS, since __declspec(thread) approach to thread local
# storage does not work properly in DLLs.
-ADD_DEFINITIONS(-DUSE_TLS -DHAVE_ROW_BASED_REPLICATION -DMYSQL_SERVER
- -DEMBEDDED_LIBRARY)
+ADD_DEFINITIONS(-DUSE_TLS -DMYSQL_SERVER -DEMBEDDED_LIBRARY)
# The old Windows build method used renamed (.cc -> .cpp) source files, fails
# in #include in lib_sql.cc. So disable that using the USING_CMAKE define.
--- 1.3/config/ac-macros/replication.m4 2006-04-24 10:38:04 -04:00
+++ 1.7/BitKeeper/deleted/.del-replication.m4 2006-12-07 09:11:12 -05:00
@@ -1,30 +1,2 @@
dnl This file contains configuration parameters for replication.
-dnl ---------------------------------------------------------------------------
-dnl Macro: MYSQL_CHECK_REPLICATION
-dnl Sets HAVE_ROW_BASED_REPLICATION if --with-row-based-replication is used
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN([MYSQL_CHECK_REPLICATION], [
- AC_ARG_WITH([row-based-replication],
- AC_HELP_STRING([--without-row-based-replication],
- [Don't include row-based replication]),
- [row_based="$withval"],
- [row_based=yes])
- AC_MSG_CHECKING([for row-based replication])
-
- case "$row_based" in
- yes )
- AC_DEFINE([WITH_ROW_BASED_REPLICATION], [1], [Define to have row-based replication])
- AC_MSG_RESULT([-- including row-based replication])
- [have_row_based=yes]
- ;;
- * )
- AC_MSG_RESULT([-- not including row-based replication])
- [have_row_based=no]
- ;;
- esac
-])
-dnl ---------------------------------------------------------------------------
-dnl END OF MYSQL_CHECK_REPLICATION
-dnl ---------------------------------------------------------------------------
--- 1.3/mysql-test/extra/rpl_tests/rpl_row_basic.test 2006-10-02 04:41:33 -04:00
+++ 1.4/mysql-test/extra/rpl_tests/rpl_row_basic.test 2006-12-07 09:18:27 -05:00
@@ -1,4 +1,3 @@
---source include/have_row_based.inc
--source include/have_binlog_format_row.inc
--source include/master-slave.inc
--- 1.3/mysql-test/t/rpl_row_max_relay_size.test 2006-09-21 08:19:14 -04:00
+++ 1.4/mysql-test/t/rpl_row_max_relay_size.test 2006-12-07 09:18:27 -05:00
@@ -5,7 +5,6 @@
# Requires statement logging
-- source include/not_ndb_default.inc
--- source include/have_row_based.inc
SET SESSION BINLOG_FORMAT=ROW;
SET GLOBAL BINLOG_FORMAT=ROW;
-- source extra/rpl_tests/rpl_max_relay_size.test
--- 1.17/sql/log.h 2006-10-24 08:55:21 -04:00
+++ 1.18/sql/log.h 2006-12-07 09:18:27 -05:00
@@ -601,14 +601,12 @@
enum enum_binlog_format {
BINLOG_FORMAT_STMT= 0, // statement-based
-#ifdef HAVE_ROW_BASED_REPLICATION
BINLOG_FORMAT_ROW= 1, // row_based
/*
statement-based except for cases where only row-based can work (UUID()
etc):
*/
BINLOG_FORMAT_MIXED= 2,
-#endif
/*
This value is last, after the end of binlog_format_typelib: it has no
corresponding cell in this typelib. We use this value to be able to know if
--- 1.2/mysql-test/extra/rpl_tests/rpl_truncate.test 2006-06-19 03:25:43 -04:00
+++ 1.3/mysql-test/extra/rpl_tests/rpl_truncate.test 2006-12-07 09:18:27 -05:00
@@ -7,7 +7,6 @@
#
# Author(s): Mats Kindahl
---source include/have_row_based.inc
--source include/master-slave.inc
let $format = STATEMENT;
--- 1.5/mysql-test/t/rpl_rbr_to_sbr.test 2006-09-15 10:25:10 -04:00
+++ 1.6/mysql-test/t/rpl_rbr_to_sbr.test 2006-12-07 09:18:27 -05:00
@@ -1,4 +1,3 @@
--- source include/have_row_based.inc
-- source include/have_binlog_format_mixed_or_statement.inc
-- source include/not_ndb_default.inc
-- source include/master-slave.inc
--- 1.10/mysql-test/t/rpl_row_basic_11bugs.test 2006-10-02 07:38:00 -04:00
+++ 1.11/mysql-test/t/rpl_row_basic_11bugs.test 2006-12-07 09:18:27 -05:00
@@ -1,4 +1,3 @@
---source include/have_row_based.inc
--source include/have_binlog_format_row.inc
--- 1.5/mysql-test/t/rpl_row_basic_8partition.test 2006-09-15 10:25:10 -04:00
+++ 1.6/mysql-test/t/rpl_row_basic_8partition.test 2006-12-07 09:18:27 -05:00
@@ -7,7 +7,6 @@
# partition tables with same engine (MyISAM) in both ends. #
############################################################
---source include/have_row_based.inc
--source include/have_binlog_format_row.inc
--source include/have_partition.inc
--source include/not_ndb_default.inc
--- 1.149/include/my_global.h 2006-11-02 17:48:05 -05:00
+++ 1.150/include/my_global.h 2006-12-07 09:18:27 -05:00
@@ -79,9 +79,6 @@
#endif /* _WIN32... */
#ifndef EMBEDDED_LIBRARY
-#ifdef WITH_ROW_BASED_REPLICATION
-#define HAVE_ROW_BASED_REPLICATION 1
-#endif
#ifdef WITH_NDB_BINLOG
#define HAVE_NDB_BINLOG 1
#endif
--- 1.200/sql/set_var.cc 2006-11-07 00:59:45 -05:00
+++ 1.201/sql/set_var.cc 2006-12-07 09:18:28 -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.93/sql/set_var.h 2006-09-01 07:08:37 -04:00
+++ 1.94/sql/set_var.h 2006-12-07 09:18:28 -05:00
@@ -940,9 +940,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
{
@@ -950,9 +948,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;
--- 1.243/sql/sp_head.cc 2006-11-16 03:45:58 -05:00
+++ 1.244/sql/sp_head.cc 2006-12-07 09:18:28 -05:00
@@ -1850,7 +1850,6 @@
oldlex->next_state= sublex->next_state;
oldlex->trg_table_fields.push_back(&sublex->trg_table_fields);
-#ifdef HAVE_ROW_BASED_REPLICATION
/*
If this substatement needs row-based, the entire routine does too (we
cannot switch from statement-based to row-based only for this
@@ -1858,7 +1857,6 @@
*/
if (sublex->binlog_row_based_if_mixed)
m_flags|= BINLOG_ROW_BASED_IF_MIXED;
-#endif
/*
Add routines which are used by statement to respective set for
--- 1.92/sql/sp_head.h 2006-08-30 15:09:39 -04:00
+++ 1.93/sql/sp_head.h 2006-12-07 09:18:28 -05:00
@@ -362,7 +362,6 @@
*/
void propagate_attributes(LEX *lex)
{
-#ifdef HAVE_ROW_BASED_REPLICATION
/*
If this routine needs row-based binary logging, the entire top statement
too (we cannot switch from statement-based to row-based only for this
@@ -371,7 +370,6 @@
*/
if (m_flags & BINLOG_ROW_BASED_IF_MIXED)
lex->binlog_row_based_if_mixed= TRUE;
-#endif
}
--- 1.31/sql/CMakeLists.txt 2006-10-31 10:51:49 -05:00
+++ 1.32/sql/CMakeLists.txt 2006-12-07 09:18:27 -05:00
@@ -22,8 +22,7 @@
${PROJECT_SOURCE_DIR}/include/sql_state.h
PROPERTIES GENERATED 1)
-ADD_DEFINITIONS(-DHAVE_ROW_BASED_REPLICATION -DMYSQL_SERVER
- -D_CONSOLE -DHAVE_DLOPEN)
+ADD_DEFINITIONS(-DMYSQL_SERVER -D_CONSOLE -DHAVE_DLOPEN)
ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc
discover.cc ../libmysql/errmsg.c field.cc field_conv.cc
--- 1.6/sql/rpl_injector.cc 2006-11-13 09:41:56 -05:00
+++ 1.7/sql/rpl_injector.cc 2006-12-07 09:18:28 -05:00
@@ -17,7 +17,6 @@
#include "mysql_priv.h"
#include "rpl_injector.h"
-#ifdef HAVE_ROW_BASED_REPLICATION
/*
injector::transaction - member definitions
@@ -191,5 +190,3 @@
DBUG_VOID_RETURN;
}
-
-#endif
--- 1.5/sql/rpl_injector.h 2006-06-23 09:05:09 -04:00
+++ 1.6/sql/rpl_injector.h 2006-12-07 09:18:28 -05:00
@@ -21,7 +21,6 @@
/* Pull in 'byte', 'my_off_t', and 'uint32' */
#include <my_global.h>
-#ifdef HAVE_ROW_BASED_REPLICATION
#include <my_bitmap.h>
/* Forward declarations */
@@ -331,5 +330,4 @@
*/
};
-#endif /* HAVE_ROW_BASED_REPLICATION */
#endif /* INJECTOR_H */
| Thread |
|---|
| • bk commit into 5.1 tree (cbell:1.2373) | cbell | 7 Dec |
