diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-06-25 03:40:30 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-06-25 03:40:30 +0500 |
| commit | 362852ba801eb4fe9fd0c46941f1561a391088c0 (patch) | |
| tree | cc7610ed3772133691960cf0b1ee425bdaac69f8 /sql/sp.cc | |
| parent | 81d32154d2814b38b68a9a8c8d4c3e27e337ad07 (diff) | |
| parent | 1ba9b0a9f192ff2e0b04781d6019aa181d4a10e9 (diff) | |
| download | mariadb-git-362852ba801eb4fe9fd0c46941f1561a391088c0.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.1
into gleb.loc:/home/uchum/work/bk/5.1-opt
sql/item.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_view.cc:
Auto merged
mysql-test/r/rpl_change_master.result:
Merge with 5.1.
mysql-test/t/rpl_change_master.test:
Merge with 5.1.
sql/sql_acl.cc:
Merge with 5.1.
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index a8e6c2844a2..6e890f638d0 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -654,13 +654,7 @@ sp_drop_routine(THD *thd, int type, sp_name *name) if (ret == SP_OK) { - if (mysql_bin_log.is_open()) - { - thd->clear_error(); - thd->binlog_query(THD::MYSQL_QUERY_TYPE, - thd->query, thd->query_length, FALSE, FALSE); - } - + write_bin_log(thd, TRUE, thd->query, thd->query_length); sp_cache_invalidate(); } @@ -727,13 +721,7 @@ sp_update_routine(THD *thd, int type, sp_name *name, st_sp_chistics *chistics) if (ret == SP_OK) { - if (mysql_bin_log.is_open()) - { - thd->clear_error(); - thd->binlog_query(THD::MYSQL_QUERY_TYPE, - thd->query, thd->query_length, FALSE, FALSE); - } - + write_bin_log(thd, TRUE, thd->query, thd->query_length); sp_cache_invalidate(); } |