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/ha_innodb.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/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 60ec6f8e2bb..56e5fd8923f 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -2198,11 +2198,13 @@ innobase_savepoint( DBUG_ENTER("innobase_savepoint"); - if (!(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) { - /* In the autocommit state there is no sense to set a - savepoint: we return immediate success */ - DBUG_RETURN(0); - } + /* + In the autocommit mode there is no sense to set a savepoint + (unless we are in sub-statement), so SQL layer ensures that + this method is never called in such situation. + */ + DBUG_ASSERT(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN) || + thd->in_sub_stmt); trx = check_trx_exists(thd); |