diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-11-29 12:30:04 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-11-29 12:30:04 +0200 |
| commit | 042c34d86dad7f37ff39345f6716c2f25ffeab53 (patch) | |
| tree | 149db652e4b38984a7f819d9ba21f2e79c669ae5 /sql/sql_handler.cc | |
| parent | 5b62dfcdf51a695ebc724cb453919eb909ca274f (diff) | |
| download | mariadb-git-042c34d86dad7f37ff39345f6716c2f25ffeab53.tar.gz | |
checking columns of top items
mysql-test/r/row_test.result:
changed error message (report requestet columns number)
new tests
mysql-test/t/row_test.test:
new tests
sql/item.h:
checking columns of wrapper items
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 c43869d9d55..909e1643fe5 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->fix_fields(thd, tables, &cond)) + if (cond && (cond->check_cols(1) || cond->fix_fields(thd, tables, &cond))) return -1; if (keyname) |