summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2001-01-01 14:17:10 +0200
committermonty@donna.mysql.com <>2001-01-01 14:17:10 +0200
commite05df20dc5e5791d1725ffe9add9b813b69a67c0 (patch)
tree290e7b9ca68fdbcc58714c71951a1a399601dec6 /sql
parent336019a559d8a521586af8d44259dda4d2010bbc (diff)
downloadmariadb-git-e05df20dc5e5791d1725ffe9add9b813b69a67c0.tar.gz
Fixed gethostname_r tests to be more portable
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_parse.cc2
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)))