diff options
| author | unknown <timour@mysql.com> | 2005-12-06 18:04:26 +0200 |
|---|---|---|
| committer | unknown <timour@mysql.com> | 2005-12-06 18:04:26 +0200 |
| commit | 08cfcda0fd18ac561540417c66186e904eff75bc (patch) | |
| tree | b7f446c2b01791b8e340597e85c4cd62eaf92794 /sql/item.cc | |
| parent | 871806cfed9b6cadf4db37f2a783404ecdca1696 (diff) | |
| parent | 9a724d875b4007bb3eb6cc12cafddf2a9e639f0e (diff) | |
| download | mariadb-git-08cfcda0fd18ac561540417c66186e904eff75bc.tar.gz | |
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into mysql.com:/home/timka/mysql/src/5.0-2486
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index c45727d1e93..c15fd948b5a 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -5165,7 +5165,7 @@ void Item_trigger_field::setup_field(THD *thd, TABLE *table) set field_idx properly. */ (void)find_field_in_table(thd, table, field_name, (uint) strlen(field_name), - 0, 0, &field_idx, 0); + 0, &field_idx); thd->set_query_id= save_set_query_id; triggers= table->triggers; } |