summaryrefslogtreecommitdiff
path: root/sql/sql_trigger.h
diff options
context:
space:
mode:
authormonty@mysql.com/narttu.mysql.fi <>2007-01-22 14:04:40 +0200
committermonty@mysql.com/narttu.mysql.fi <>2007-01-22 14:04:40 +0200
commita04157fbb3f2b2e054c02968ffc82bb0eb971d58 (patch)
treedb1cb9732cc2b568c4a56c3f6d11cf8f4d5250b6 /sql/sql_trigger.h
parent205f7a0583f5ba5cc0c6428fa6e44c74b534d8e8 (diff)
parent9d3fda77c8e20ff299f9750b64c42dfbb58a7806 (diff)
downloadmariadb-git-a04157fbb3f2b2e054c02968ffc82bb0eb971d58.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'sql/sql_trigger.h')
-rw-r--r--sql/sql_trigger.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_trigger.h b/sql/sql_trigger.h
index 91ce571e3f5..c920d23d8ee 100644
--- a/sql/sql_trigger.h
+++ b/sql/sql_trigger.h
@@ -42,8 +42,9 @@ class Table_triggers_list: public Sql_alloc
*/
Field **new_field;
Field **old_field;
+
/* TABLE instance for which this triggers list object was created */
- TABLE *table;
+ TABLE *trigger_table;
/*
Names of triggers.
Should correspond to order of triggers on definitions_list,
@@ -83,7 +84,7 @@ public:
List<LEX_STRING> definers_list;
Table_triggers_list(TABLE *table_arg):
- record1_field(0), table(table_arg)
+ record1_field(0), trigger_table(table_arg)
{
bzero((char *)bodies, sizeof(bodies));
bzero((char *)trigger_fields, sizeof(trigger_fields));