diff options
| author | Marc Alff <marc.alff@sun.com> | 2009-09-17 03:20:11 -0600 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2009-09-17 03:20:11 -0600 |
| commit | 071634bb3578a3949e09197f7eb17c5619d01562 (patch) | |
| tree | d0d731222454addb05b3890fb2bc555da5af7d63 /sql/set_var.cc | |
| parent | ea0d4516ed796179ef97a791bb04a646ac98610b (diff) | |
| parent | c65bfe456456db2aa60e2275b9ca428c76bbede4 (diff) | |
| download | mariadb-git-071634bb3578a3949e09197f7eb17c5619d01562.tar.gz | |
Merge mysql-next-mr --> mysql-trunk-signal
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 185fc33deb9..dc966c306a5 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1238,6 +1238,7 @@ void fix_slave_exec_mode(enum_var_type type) } if (bit_is_set(slave_exec_mode_options, SLAVE_EXEC_MODE_IDEMPOTENT) == 0) bit_do_set(slave_exec_mode_options, SLAVE_EXEC_MODE_STRICT); + DBUG_VOID_RETURN; } |