summaryrefslogtreecommitdiff
path: root/sql/sql_trigger.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-02-11 09:45:34 +0100
committerSergei Golubchik <serg@mariadb.org>2017-02-11 09:45:34 +0100
commitf3914d10b61eb4bc4184b2a9aa92a998e1abd779 (patch)
tree0f973c0dc2fb1f667ed852e4177b17938e28b6b9 /sql/sql_trigger.cc
parent559345806216369bad999539018bd3943860a5d5 (diff)
parent2195bb4e416232ab807ff67eecf03b1223bf6bff (diff)
downloadmariadb-git-f3914d10b61eb4bc4184b2a9aa92a998e1abd779.tar.gz
Merge branch 'bb-10.2-serg-merge' into 10.2
Diffstat (limited to 'sql/sql_trigger.cc')
-rw-r--r--sql/sql_trigger.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
index 00540399abd..ca9b1431785 100644
--- a/sql/sql_trigger.cc
+++ b/sql/sql_trigger.cc
@@ -2504,4 +2504,3 @@ bool load_table_name_for_trigger(THD *thd,
DBUG_RETURN(FALSE);
}
-