diff options
| author | unknown <serg@serg.mylan> | 2005-02-22 15:22:37 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-02-22 15:22:37 +0100 |
| commit | 7caef7f4aa826db751626a9833c70df33ebf1363 (patch) | |
| tree | 97a0fc943f0fefa7f11f4a58e4ccb54e23b025bc /sql/ha_innodb.cc | |
| parent | 17cca96ec9c613a0e25cf78f7230bd9ebfb72010 (diff) | |
| download | mariadb-git-7caef7f4aa826db751626a9833c70df33ebf1363.tar.gz | |
compatibility fixes, crashing tests
include/my_sys.h:
sol9x86, sunfire100b, qnx compatibility
mysql-test/t/rpl_rotate_logs.test:
fix the test
sql/ha_innodb.cc:
don't bother
sql/handler.cc:
few more ways to crash mysqld :)
sql/handler.h:
gdb/safemalloc workaround
sql/log.cc:
rotate a binlog on heuristic recover
sql/mysqld.cc:
rotate a binlog on heuristic recover
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index d6e17b3b5e2..ac5cb4221be 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -1346,14 +1346,14 @@ innobase_commit_low( return; } -#ifdef HAVE_REPLICATION +#ifdef DISABLE_HAVE_REPLICATION if (current_thd->slave_thread) { /* Update the replication position info inside InnoDB */ trx->mysql_master_log_file_name = active_mi->rli.group_master_log_name; trx->mysql_master_log_pos= ((ib_longlong) - active_mi->rli.future_group_master_log_pos); + active_mi->rli.future_group_master_log_pos); } #endif /* HAVE_REPLICATION */ |