diff options
| author | unknown <cbell/Chuck@suse.vabb.com> | 2006-12-07 09:18:35 -0500 |
|---|---|---|
| committer | unknown <cbell/Chuck@suse.vabb.com> | 2006-12-07 09:18:35 -0500 |
| commit | 85a8f7c7a9bf8e067500a78899874f1298e2bdf4 (patch) | |
| tree | c08b6d74a80b3c187b4d906a036d251117a9fc60 /sql/sql_base.cc | |
| parent | d3f711fafc4928f941b8fc2fbceed5109b5d8bde (diff) | |
| download | mariadb-git-85a8f7c7a9bf8e067500a78899874f1298e2bdf4.tar.gz | |
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
BitKeeper/deleted/.del-have_row_based.require:
Delete: mysql-test/r/have_row_based.require
BitKeeper/deleted/.del-not_row_based.require:
Delete: mysql-test/r/not_row_based.require
BitKeeper/deleted/.del-have_row_based.inc:
Delete: mysql-test/include/have_row_based.inc
BitKeeper/deleted/.del-not_row_based.inc:
Delete: mysql-test/include/not_row_based.inc
BitKeeper/deleted/.del-replication.m4:
Delete: config/ac-macros/replication.m4
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 28bc1e9dcbf..76280471a99 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1064,9 +1064,7 @@ void close_thread_tables(THD *thd, bool lock_in_use, bool skip_derived) 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 @@ int lock_tables(THD *thd, TABLE_LIST *tables, uint count, bool *need_reopen) *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 @@ int lock_tables(THD *thd, TABLE_LIST *tables, uint count, bool *need_reopen) { 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 @@ int lock_tables(THD *thd, TABLE_LIST *tables, uint count, bool *need_reopen) 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), |