diff options
| author | unknown <holyfoot@mysql.com> | 2006-04-27 15:07:36 +0500 |
|---|---|---|
| committer | unknown <holyfoot@mysql.com> | 2006-04-27 15:07:36 +0500 |
| commit | eae76a32b2e8798610b4719a5f67956625291257 (patch) | |
| tree | f7ccd3b75989849bfd9dcff7f3c249dc33055fa3 /sql/sql_parse.cc | |
| parent | 3ada0dd96f3c5d32a4f5a39cefb75bfd321029cd (diff) | |
| parent | ca3277a87cf158d6e51b62cb8e0fb222e6cf883e (diff) | |
| download | mariadb-git-eae76a32b2e8798610b4719a5f67956625291257.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-new
into mysql.com:/home/hf/work/mysql-5.1.18518
include/my_global.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 2886f6dc267..b4cd4ee9804 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2459,8 +2459,10 @@ mysql_execute_command(THD *thd) statistic_increment(thd->status_var.com_stat[lex->sql_command], &LOCK_status); +#ifdef HAVE_ROW_BASED_REPLICATION if (lex->binlog_row_based_if_mixed) thd->set_current_stmt_binlog_row_based_if_mixed(); +#endif /*HAVE_ROW_BASED_REPLICATION*/ switch (lex->sql_command) { case SQLCOM_SELECT: @@ -5126,7 +5128,9 @@ end: */ if (thd->one_shot_set && lex->sql_command != SQLCOM_SET_OPTION) reset_one_shot_variables(thd); +#ifdef HAVE_ROW_BASED_REPLICATION thd->reset_current_stmt_binlog_row_based(); +#endif /*HAVE_ROW_BASED_REPLICATION*/ /* The return value for ROW_COUNT() is "implementation dependent" if the |