summaryrefslogtreecommitdiff
path: root/sql/sql_trigger.cc
diff options
context:
space:
mode:
authorJoerg Bruehe <joerg@mysql.com>2009-07-09 23:10:50 +0200
committerJoerg Bruehe <joerg@mysql.com>2009-07-09 23:10:50 +0200
commit67ffeccf2c5baeecd54191e7f3e5ef06aad1f71a (patch)
tree90adb4d952d048c2bf8d97e20ef78c5b0af453ec /sql/sql_trigger.cc
parent3e754876fcea32d6063ebd204b787566659f4948 (diff)
parente60ea9e8ac0564336d7dbd864c7374fa352e3281 (diff)
downloadmariadb-git-67ffeccf2c5baeecd54191e7f3e5ef06aad1f71a.tar.gz
Merge main 5.0 into 5.0-build.
Diffstat (limited to 'sql/sql_trigger.cc')
-rw-r--r--sql/sql_trigger.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
index d2ae494d4eb..1fa8b83f300 100644
--- a/sql/sql_trigger.cc
+++ b/sql/sql_trigger.cc
@@ -179,7 +179,7 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create)
need second part of condition below, since check_access() function also
checks that db is specified.
*/
- if (!thd->lex->spname->m_db.length || create && !tables->db_length)
+ if (!thd->lex->spname->m_db.length || (create && !tables->db_length))
{
my_error(ER_NO_DB_ERROR, MYF(0));
DBUG_RETURN(TRUE);