diff options
| author | unknown <kostja@bodhi.local> | 2007-03-06 16:44:14 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2007-03-06 16:44:14 +0300 |
| commit | c155c66da65e3d19b2baec7d141648dfd9b55f52 (patch) | |
| tree | 5ab59b0392a68db1b929fa51dcc17626e375132e /sql/handler.cc | |
| parent | 198a8abd87e787c8dd9e92eedadd59b03dba257c (diff) | |
| parent | 4268313e50e8ebe69e1baaef4d84f54c2764dfb1 (diff) | |
| download | mariadb-git-c155c66da65e3d19b2baec7d141648dfd9b55f52.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
mysql-test/t/disabled.def:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
mysql-test/r/show_check.result:
Manual merge.
mysql-test/t/show_check.test:
Manual merge.
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index c1a28943278..23c3103493e 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -3451,7 +3451,7 @@ namespace { { int const check(table->s->tmp_table == NO_TMP_TABLE && binlog_filter->db_ok(table->s->db.str) && - strcmp("mysql", table->s->db.str) != 0); + !table->no_replicate); table->s->cached_row_logging_check= check; } |