diff options
author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-07-13 13:11:51 +0200 |
---|---|---|
committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-07-13 13:11:51 +0200 |
commit | 5fde853be884d593643ea8539f501afad9882181 (patch) | |
tree | 199ce8a04e25b10c9f6a328a570df1abbba0578f /sql/sql_insert.cc | |
parent | e5ca7155485483d6b9339f3c8197ba647ac1f1ef (diff) | |
parent | 9ea8a51178e5315957d862de2eed38df2afe9161 (diff) | |
download | mariadb-git-5fde853be884d593643ea8539f501afad9882181.tar.gz |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
BitKeeper/etc/config:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_insert.cc')
-rw-r--r-- | sql/sql_insert.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 46cc73d36cd..bfd4bd83a81 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1131,7 +1131,7 @@ int check_that_all_fields_are_given_values(THD *thd, TABLE *entry, table_list= (table_list->belong_to_view ? table_list->belong_to_view : table_list); - view= (bool)(table_list->view); + view= test(table_list->view); } if (view) { |