diff options
| author | lars/lthalmann@dl145h.mysql.com <> | 2007-06-18 12:10:36 +0200 |
|---|---|---|
| committer | lars/lthalmann@dl145h.mysql.com <> | 2007-06-18 12:10:36 +0200 |
| commit | a2d93c53dbbb4ebf9cff75571a264257be11789d (patch) | |
| tree | fa35400ab393c7b0d559a0ed371af7d334a77627 /sql/set_var.cc | |
| parent | 674675a70c6817c0713fecd204b4aef85b2ddb6d (diff) | |
| parent | ae52876fd04e17bb922759b09ce45e2ecc0e0df0 (diff) | |
| download | mariadb-git-a2d93c53dbbb4ebf9cff75571a264257be11789d.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 76c8283ebf6..d9869ce6809 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1009,17 +1009,6 @@ bool sys_var_thd_binlog_format::is_readonly() const my_error(ER_STORED_FUNCTION_PREVENTS_SWITCH_BINLOG_FORMAT, MYF(0)); return 1; } -#ifdef HAVE_NDB_BINLOG - /* - Cluster does not support changing the binlog format on the fly yet. - */ - LEX_STRING ndb_name= {(char*)STRING_WITH_LEN("ndbcluster")}; - if (opt_bin_log && plugin_is_ready(&ndb_name, MYSQL_STORAGE_ENGINE_PLUGIN)) - { - my_error(ER_NDB_CANT_SWITCH_BINLOG_FORMAT, MYF(0)); - return 1; - } -#endif /* HAVE_NDB_BINLOG */ return sys_var_thd_enum::is_readonly(); } |