diff options
| author | unknown <dlenev@mysql.com> | 2005-11-19 15:11:57 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-11-19 15:11:57 +0300 |
| commit | e2de3a8fc4432788b6e7fff6dce884b8eb7b1a44 (patch) | |
| tree | 03a4051dfbf4ff6941306a61203be4a69e24499a /sql/sql_parse.cc | |
| parent | 6ba79a251681a765f491db1428a467a0a06a69bd (diff) | |
| parent | 11d4d7e6ff3c8b82e47bb62e26b1f10690daabb0 (diff) | |
| download | mariadb-git-e2de3a8fc4432788b6e7fff6dce884b8eb7b1a44.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg13825
sql/ha_innodb.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 1e6810e0036..793dd18e56b 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -4033,8 +4033,8 @@ end_with_restore_list: break; } case SQLCOM_SAVEPOINT: - if (!(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)) || - !opt_using_transactions) + if (!(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN) || + thd->in_sub_stmt) || !opt_using_transactions) send_ok(thd); else { |