diff options
| author | unknown <guilhem@mysql.com> | 2004-06-24 14:42:56 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-06-24 14:42:56 +0200 |
| commit | 7d999002436edc4b2cd5d713683535f2e40bc9b4 (patch) | |
| tree | 58b84430c3c85d55d9cecc6caae1befc17c5084a /sql/mysqld.cc | |
| parent | 147922dc14b239d3c643e567d5273f31e30e76ce (diff) | |
| download | mariadb-git-7d999002436edc4b2cd5d713683535f2e40bc9b4.tar.gz | |
Enabling the --innodb-safe-binlog option in code. If you wish to disable it,
you just need to change this line of mysqld.cc:
#if MYSQL_VERSION_ID >= 40103
to, say,
#if MYSQL_VERSION_ID > 40103
I am noticing a failure of bdb.test; I believe this is not related to the
code I added yesterday and today, but I am checking. In any case I push this
changeset as it cannot by itself bring more mess that I *may* (or not)
already have brought with previous pushes.
sql/handler.cc:
if innodb_active_trans is true then innobase_tid too.
sql/mysqld.cc:
only a warning if --innodb-safe-binlog without InnoDB (it's true this situation will not hurt).
Enabling the --innodb-safe-binlog option.
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 7 |
1 files changed, 2 insertions, 5 deletions
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 |