diff options
| author | mats@kindahl-laptop.dnsalias.net <> | 2007-06-12 22:02:46 +0200 |
|---|---|---|
| committer | mats@kindahl-laptop.dnsalias.net <> | 2007-06-12 22:02:46 +0200 |
| commit | ec58bfb28a1f6bf817554722c5f98bab290bfa66 (patch) | |
| tree | e252590c0287c7b25e8b7d291290be7d7a77d932 /sql/set_var.cc | |
| parent | 964369b58cbfb1267056f12933b580373005d143 (diff) | |
| parent | 526a0cecda05e4028a9197239b39df01d03a45ee (diff) | |
| download | mariadb-git-ec58bfb28a1f6bf817554722c5f98bab290bfa66.tar.gz | |
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
into kindahl-laptop.dnsalias.net:/home/bk/b23051-mysql-5.1-rpl
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 a6fd3ab1242..70cf8ae1cd1 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1007,17 +1007,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(); } |