diff options
| author | unknown <lars/lthalmann@dl145h.mysql.com> | 2007-06-18 12:10:36 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145h.mysql.com> | 2007-06-18 12:10:36 +0200 |
| commit | 6da3c0facc5dea87c4a2dbb90cac4305ccdad74c (patch) | |
| tree | fa35400ab393c7b0d559a0ed371af7d334a77627 /sql/set_var.cc | |
| parent | 1140898b32f91ccee38585ccb3b026455c41943c (diff) | |
| parent | f9c8d1dd7fbf4c0d55a135fdda7f40c970af1a19 (diff) | |
| download | mariadb-git-6da3c0facc5dea87c4a2dbb90cac4305ccdad74c.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
mysql-test/t/ndb_insert.test:
Auto merged
mysql-test/t/ndb_restore.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisammrg/ha_myisammrg.h:
Auto merged
sql/share/errmsg.txt:
SCCS merged
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(); } |