diff options
| author | unknown <monty@donna.mysql.com> | 2001-02-15 18:00:30 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-02-15 18:00:30 +0200 |
| commit | f5fefc94f224a6d1ebdee0d114b0f1ef0e56fe99 (patch) | |
| tree | a3e9a3145e67c442ddb56eee95bebb7b87ff66bc /sql/handler.cc | |
| parent | dcd26ca7b9c5fc237c051045573dd8fd16163297 (diff) | |
| download | mariadb-git-f5fefc94f224a6d1ebdee0d114b0f1ef0e56fe99.tar.gz | |
Updates for innobase
Removed a ' that casued 'make paper' to fail
Docs/manual.texi:
Updated myisamchk section; Removed a ' that casued 'make paper' to fail
sql/handler.cc:
Updates for innobase
sql/mysqld.cc:
Updates for innobase
sql/sql_parse.cc:
Fixed possible overrun if the mysqld server name is too big
sql/sql_select.cc:
Updates for innobase
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 3859f496f9a..9023e8e9908 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -178,7 +178,7 @@ void ha_close_connection(THD* thd) { #ifdef HAVE_INNOBASE_DB if (!innobase_skip) - innobase_close_connection(THD* thd); + innobase_close_connection(thd); #endif } @@ -236,7 +236,6 @@ int ha_commit_trans(THD *thd, THD_TRANS* trans) my_error(ER_ERROR_DURING_COMMIT, MYF(0), error); error=1; } - trans->innobase_tid=0; } #endif if (error && trans == &thd->transaction.all && mysql_bin_log.is_open()) @@ -263,12 +262,11 @@ int ha_rollback_trans(THD *thd, THD_TRANS *trans) #ifdef HAVE_INNOBASE_DB if (trans->innobase_tid) { - if ((error=innobase_rollback(thd))) + if ((error=innobase_rollback(thd, trans->innobase_tid))) { my_error(ER_ERROR_DURING_ROLLBACK, MYF(0), error); error=1; } - trans->innobase_tid=0; } #endif #ifdef USING_TRANSACTIONS |