diff options
| author | unknown <monty@donna.mysql.com> | 2001-01-01 14:21:12 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-01-01 14:21:12 +0200 |
| commit | 7e687f893ccb170fe03af34639e8837a53cb2ac5 (patch) | |
| tree | b2297638bf77aa5e2fe7f7825187eb7b40ec6810 /sql | |
| parent | fedf7f236d948d7e68789f1638aebbb71d9e9ff9 (diff) | |
| parent | dcd25bc9f4db6313b0fa0e75f03888f52970ef77 (diff) | |
| download | mariadb-git-7e687f893ccb170fe03af34639e8837a53cb2ac5.tar.gz | |
Merge
BitKeeper/etc/ignore:
added tmp/*
Docs/manual.texi:
SCCS merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 85ef7d24d67..c1c27ec3192 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1652,7 +1652,7 @@ mysql_execute_command(void) thd->locked_tables=0; // Will be automaticly closed close_thread_tables(thd); } - if (check_db_used(thd,tables)) + if (check_db_used(thd,tables) || end_active_trans(thd)) goto error; thd->in_lock_tables=1; if (!(res=open_and_lock_tables(thd,tables))) |