diff options
| author | unknown <guilhem@mysql.com> | 2004-06-24 15:32:32 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-06-24 15:32:32 +0200 |
| commit | 5b1b5f63a07d27c18bccb1596c67017ce901f9c4 (patch) | |
| tree | 6b34e5005bd1a0e0e73fd5217e53ec1a44cf81a6 | |
| parent | eff49bb34bec3ec8ae5deea2c11c70e95aafbfc5 (diff) | |
| parent | 7d999002436edc4b2cd5d713683535f2e40bc9b4 (diff) | |
| download | mariadb-git-5b1b5f63a07d27c18bccb1596c67017ce901f9c4.tar.gz | |
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-1717
| -rw-r--r-- | sql/handler.cc | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index f4cd2901be1..f11c7d5eac3 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -385,7 +385,7 @@ int ha_report_binlog_offset_and_commit(THD *thd, #ifdef HAVE_INNOBASE_DB THD_TRANS *trans; trans = &thd->transaction.all; - if (trans->innobase_tid && trans->innodb_active_trans) + if (trans->innodb_active_trans) { /* If we updated some InnoDB tables (innodb_active_trans is true), the diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 7b36be3dd84..6caba1dfe95 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2539,11 +2539,8 @@ server."); if (opt_innodb_safe_binlog) { if (have_innodb != SHOW_OPTION_YES) - { - sql_print_error("Error: --innodb-safe-binlog is meaningful only if " + sql_print_error("Warning: --innodb-safe-binlog is meaningful only if " "the InnoDB storage engine is enabled in the server."); - unireg_abort(1); - } if (innobase_flush_log_at_trx_commit != 1) { sql_print_error("Warning: --innodb-safe-binlog is meaningful only if " @@ -4639,7 +4636,7 @@ replicating a LOAD DATA INFILE command.", enough, as then user can't set it to 1 so it will always be ignored in the rest of code. */ -#if MYSQL_VERSION_ID > 40103 +#if MYSQL_VERSION_ID >= 40103 /* innodb_safe_binlog is not a variable, just an option. Does not make sense to make it a variable, as it is only used at startup (and so the |