diff options
author | unknown <bell@sanja.is.com.ua> | 2003-01-21 13:55:26 +0200 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2003-01-21 13:55:26 +0200 |
commit | 8a3d3a539fa3aa2967c76c3eb59033a13524aeed (patch) | |
tree | 9e72427611ac5057a8bf3051e0bd43678e33a8a2 /sql/sql_handler.cc | |
parent | 3ffd7865b02a37569f955e40505f2f6b46cbe7a0 (diff) | |
download | mariadb-git-8a3d3a539fa3aa2967c76c3eb59033a13524aeed.tar.gz |
fixed test of cardinality
mysql-test/r/subselect.result:
test of cardinality error
mysql-test/t/subselect.test:
test of cardinality error
Diffstat (limited to 'sql/sql_handler.cc')
-rw-r--r-- | sql/sql_handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index 0d8af46dbf6..acf3fd2914a 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -106,7 +106,7 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables, } tables->table=table; - if (cond && (cond->check_cols(1) || cond->fix_fields(thd, tables, &cond))) + if (cond && (cond->fix_fields(thd, tables, &cond) || cond->check_cols(1))) return -1; /* InnoDB needs to know that this table handle is used in the HANDLER */ |