diff options
| author | unknown <tulin@build.mysql.com> | 2004-09-09 10:41:33 +0200 |
|---|---|---|
| committer | unknown <tulin@build.mysql.com> | 2004-09-09 10:41:33 +0200 |
| commit | 9106686846cb87de91afe5068b29caa72e2e537b (patch) | |
| tree | 08926077476c0cd8f62d6215c6a9dc9c61d8f1bf /sql/handler.cc | |
| parent | c59228f85c881f31e3fa017d15a7c7fba8ab708a (diff) | |
| parent | 1460e454d066c928de8f95870c72a2515d8bbc79 (diff) | |
| download | mariadb-git-9106686846cb87de91afe5068b29caa72e2e537b.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/tulin/mysql-4.1-ndb-merge
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_table.cc:
Auto merged
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 4d3bf06d5f4..c7c480a80fa 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -558,7 +558,7 @@ int ha_commit_trans(THD *thd, THD_TRANS* trans) query_cache.invalidate(thd->transaction.changed_tables); #endif /*HAVE_QUERY_CACHE*/ if (error && trans == &thd->transaction.all && mysql_bin_log.is_open()) - sql_print_error("Error: Got error during commit; Binlog is not up to date!"); + sql_print_error("Got error during commit; Binlog is not up to date!"); thd->variables.tx_isolation=thd->session_tx_isolation; if (operation_done) { |