diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-09 09:15:23 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-09 09:15:23 +0300 |
| commit | a9a49dc3800b7bc9ba8e3cebe60ab6e44cf0dcab (patch) | |
| tree | 67d4f54e2c58f36ed528361a94019049638eb048 /sql/sql_parse.cc | |
| parent | 7845e7f5c0fdc9e5cdec24abd9adcee012546044 (diff) | |
| parent | 7220f1682f7f28537b94d89c91220042a4c7b689 (diff) | |
| download | mariadb-git-a9a49dc3800b7bc9ba8e3cebe60ab6e44cf0dcab.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index c5cfd3f1c85..f9ea184a159 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2432,7 +2432,6 @@ mysql_execute_command(void) } else res= -1; - thd->transaction.cleanup(); break; } case SQLCOM_ROLLBACK: @@ -2447,7 +2446,6 @@ mysql_execute_command(void) else res= -1; thd->options&= ~(ulong) (OPTION_BEGIN | OPTION_STATUS_NO_TRANS_UPDATE); - thd->transaction.cleanup(); break; default: /* Impossible */ send_ok(&thd->net); |