summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
authorunknown <holyfoot@deer.(none)>2006-04-24 19:39:33 +0500
committerunknown <holyfoot@deer.(none)>2006-04-24 19:39:33 +0500
commit7e52383d610938219db32c441a5edb821b168887 (patch)
treeed759318ab461c4a6a165ba80fddc82d5b280e8b /sql/sql_class.h
parentc2e4ef092bb4c0bf1165e97a0e4c4aac4bb42a22 (diff)
downloadmariadb-git-7e52383d610938219db32c441a5edb821b168887.tar.gz
bug #18518 (embedded server crashes starting)
The problem is that now server works properly only with the row-based replication config/ac-macros/ha_ndbcluster.m4: WITH_NDB_BINLOG instead of HAVE_NDB_BINLOG in config.h config/ac-macros/replication.m4: WITH_ROW_BASED_REPLICATION instead of HAVE_ROW_BASED_REPLICATION in config.h sql/log.cc: some #ifdef HAVE_ROW_BASED_REPLICATION added sql/mysqld.cc: some #ifdef HAVE_ROW_BASED_REPLICATION added sql/set_var.cc: some #ifdef HAVE_ROW_BASED_REPLICATION added sql/sql_base.cc: some #ifdef HAVE_ROW_BASED_REPLICATION added sql/sql_class.cc: some #ifdef HAVE_ROW_BASED_REPLICATION added sql/sql_class.h: some #ifdef HAVE_ROW_BASED_REPLICATION added sql/sql_parse.cc: some #ifdef HAVE_ROW_BASED_REPLICATION added
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index bcc00c19eb0..54d869b44c4 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -1402,6 +1402,7 @@ public:
void restore_sub_statement_state(Sub_statement_state *backup);
void set_n_backup_active_arena(Query_arena *set, Query_arena *backup);
void restore_active_arena(Query_arena *set, Query_arena *backup);
+#ifdef HAVE_ROW_BASED_REPLICATION
inline void set_current_stmt_binlog_row_based_if_mixed()
{
if (variables.binlog_format == BINLOG_FORMAT_MIXED)
@@ -1415,6 +1416,7 @@ public:
{
current_stmt_binlog_row_based= test(variables.binlog_format == BINLOG_FORMAT_ROW);
}
+#endif /*HAVE_ROW_BASED_REPLICATION*/
};